Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
	mesalib/src/mapi/glapi/gen/glX_proto_recv.py
	mesalib/src/mapi/glapi/gen/glX_proto_size.py
	mesalib/src/mapi/glapi/gen/gl_gentable.py
	mesalib/src/mapi/glapi/gen/gl_table.py

28 files changed, 3207 insertions, 3073 deletions

diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 71ab039d6..8a0377f49 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -32,6 +32,12 @@
 
 #define YYLEX_PARAM state->scanner
 
+#undef yyerror
+
+static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
+{
+   _mesa_glsl_error(loc, st, "%s", msg);
+}
 %}
 
 %pure-parser
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 35270881a..b8a7126e3 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1815,18 +1815,34 @@ assign_varying_locations(struct gl_context *ctx,
 
    if (ctx->API == API_OPENGLES2 || prog->Version == 100) {
       if (varying_vectors > ctx->Const.MaxVarying) {
-	 linker_error(prog, "shader uses too many varying vectors "
-		      "(%u > %u)\n",
-		      varying_vectors, ctx->Const.MaxVarying);
-	 return false;
+         if (ctx->Const.GLSLSkipStrictMaxVaryingLimitCheck) {
+            linker_warning(prog, "shader uses too many varying vectors "
+                           "(%u > %u), but the driver will try to optimize "
+                           "them out; this is non-portable out-of-spec "
+                           "behavior\n",
+                           varying_vectors, ctx->Const.MaxVarying);
+         } else {
+            linker_error(prog, "shader uses too many varying vectors "
+                         "(%u > %u)\n",
+                         varying_vectors, ctx->Const.MaxVarying);
+            return false;
+         }
       }
    } else {
       const unsigned float_components = varying_vectors * 4;
       if (float_components > ctx->Const.MaxVarying * 4) {
-	 linker_error(prog, "shader uses too many varying components "
-		      "(%u > %u)\n",
-		      float_components, ctx->Const.MaxVarying * 4);
-	 return false;
+         if (ctx->Const.GLSLSkipStrictMaxVaryingLimitCheck) {
+            linker_warning(prog, "shader uses too many varying components "
+                           "(%u > %u), but the driver will try to optimize "
+                           "them out; this is non-portable out-of-spec "
+                           "behavior\n",
+                           float_components, ctx->Const.MaxVarying * 4);
+         } else {
+            linker_error(prog, "shader uses too many varying components "
+                         "(%u > %u)\n",
+                         float_components, ctx->Const.MaxVarying * 4);
+            return false;
+         }
       }
    }
 
@@ -1960,8 +1976,15 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog)
       }
 
       if (sh->num_uniform_components > max_uniform_components[i]) {
-         linker_error(prog, "Too many %s shader uniform components",
-		      shader_names[i]);
+         if (ctx->Const.GLSLSkipStrictMaxUniformLimitCheck) {
+            linker_warning(prog, "Too many %s shader uniform components, "
+                           "but the driver will try to optimize them out; "
+                           "this is non-portable out-of-spec behavior\n",
+                           shader_names[i]);
+         } else {
+            linker_error(prog, "Too many %s shader uniform components",
+                         shader_names[i]);
+         }
       }
    }
 
diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index 1d5d9d8bd..bf2f6a3ed 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -1,244 +1,249 @@
-<?xml version="1.0"?>

-<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">

-

-<OpenGLAPI>

-

-<category name="GL_EXT_gpu_shader4" number="326">

-

-    <enum name="VERTEX_ATTRIB_ARRAY_INTEGER_EXT"        value="0x88FD"/>

-    <enum name="SAMPLER_1D_ARRAY_EXT"                   value="0x8DC0"/>

-    <enum name="SAMPLER_2D_ARRAY_EXT"                   value="0x8DC1"/>

-    <enum name="SAMPLER_BUFFER_EXT"                     value="0x8DC2"/>

-    <enum name="SAMPLER_1D_ARRAY_SHADOW_EXT"            value="0x8DC3"/>

-    <enum name="SAMPLER_2D_ARRAY_SHADOW_EXT"            value="0x8DC4"/>

-    <enum name="SAMPLER_CUBE_SHADOW_EXT"                value="0x8DC5"/>

-    <enum name="UNSIGNED_INT_VEC2_EXT"                  value="0x8DC6"/>

-    <enum name="UNSIGNED_INT_VEC3_EXT"                  value="0x8DC7"/>

-    <enum name="UNSIGNED_INT_VEC4_EXT"                  value="0x8DC8"/>

-    <enum name="INT_SAMPLER_1D_EXT"                     value="0x8DC9"/>

-    <enum name="INT_SAMPLER_2D_EXT"                     value="0x8DCA"/>

-    <enum name="INT_SAMPLER_3D_EXT"                     value="0x8DCB"/>

-    <enum name="INT_SAMPLER_CUBE_EXT"                   value="0x8DCC"/>

-    <enum name="INT_SAMPLER_2D_RECT_EXT"                value="0x8DCD"/>

-    <enum name="INT_SAMPLER_1D_ARRAY_EXT"               value="0x8DCE"/>

-    <enum name="INT_SAMPLER_2D_ARRAY_EXT"               value="0x8DCF"/>

-    <enum name="INT_SAMPLER_BUFFER_EXT"                 value="0x8DD0"/>

-    <enum name="UNSIGNED_INT_SAMPLER_1D_EXT"            value="0x8DD1"/>

-    <enum name="UNSIGNED_INT_SAMPLER_2D_EXT"            value="0x8DD2"/>

-    <enum name="UNSIGNED_INT_SAMPLER_3D_EXT"            value="0x8DD3"/>

-    <enum name="UNSIGNED_INT_SAMPLER_CUBE_EXT"          value="0x8DD4"/>

-    <enum name="UNSIGNED_INT_SAMPLER_2D_RECT_EXT"       value="0x8DD5"/>

-    <enum name="UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT"      value="0x8DD6"/>

-    <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"      value="0x8DD7"/>

-    <enum name="UNSIGNED_INT_SAMPLER_BUFFER_EXT"        value="0x8DD8"/>

-    <enum name="MIN_PROGRAM_TEXEL_OFFSET"               value="0x8904">

-        <size name="Get" mode="get"/>

-    </enum>

-    <enum name="MAX_PROGRAM_TEXEL_OFFSET"               value="0x8905">

-        <size name="Get" mode="get"/>

-    </enum>

-

-

-    <function name="VertexAttribI1iEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLint"/>

-    </function>

-

-    <function name="VertexAttribI2iEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLint"/>

-        <param name="y" type="GLint"/>

-    </function>

-

-    <function name="VertexAttribI3iEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLint"/>

-        <param name="y" type="GLint"/>

-        <param name="z" type="GLint"/>

-    </function>

-

-    <function name="VertexAttribI4iEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLint"/>

-        <param name="y" type="GLint"/>

-        <param name="z" type="GLint"/>

-        <param name="w" type="GLint"/>

-    </function>

-

-    <function name="VertexAttribI1uiEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLuint"/>

-    </function>

-

-    <function name="VertexAttribI2uiEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-    </function>

-

-    <function name="VertexAttribI3uiEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-        <param name="z" type="GLuint"/>

-    </function>

-

-    <function name="VertexAttribI4uiEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-        <param name="z" type="GLuint"/>

-        <param name="w" type="GLuint"/>

-    </function>

-

-    <function name="VertexAttribI1ivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLint *"/>

-    </function>

-

-    <function name="VertexAttribI2ivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLint *"/>

-    </function>

-

-    <function name="VertexAttribI3ivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLint *"/>

-    </function>

-

-    <function name="VertexAttribI4ivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLint *"/>

-    </function>

-

-    <function name="VertexAttribI1uivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLuint *"/>

-    </function>

-

-    <function name="VertexAttribI2uivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLuint *"/>

-    </function>

-

-    <function name="VertexAttribI3uivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLuint *"/>

-    </function>

-

-    <function name="VertexAttribI4uivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLuint *"/>

-    </function>

-

-    <function name="VertexAttribI4bvEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLbyte *"/>

-    </function>

-

-    <function name="VertexAttribI4svEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLshort *"/>

-    </function>

-

-    <function name="VertexAttribI4ubvEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLubyte *"/>

-    </function>

-

-    <function name="VertexAttribI4usvEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="v" type="const GLushort *"/>

-    </function>

-

-    <function name="VertexAttribIPointerEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="size" type="GLint"/>

-        <param name="type" type="GLenum"/>

-        <param name="stride" type="GLsizei"/>

-        <param name="pointer" type="const GLvoid *"/>

-    </function>

-

-    <function name="GetVertexAttribIivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="pname" type="GLenum"/>

-        <param name="params" type="GLint *"/>

-    </function>

-

-    <function name="GetVertexAttribIuivEXT" offset="assign">

-        <param name="index" type="GLuint"/>

-        <param name="pname" type="GLenum"/>

-        <param name="params" type="GLuint *"/>

-    </function>

-

-    <function name="Uniform1uiEXT" offset="assign">

-        <param name="location" type="GLint"/>

-        <param name="x" type="GLuint"/>

-    </function>

-

-    <function name="Uniform2uiEXT" offset="assign">

-        <param name="location" type="GLint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-    </function>

-

-    <function name="Uniform3uiEXT" offset="assign">

-        <param name="location" type="GLint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-        <param name="z" type="GLuint"/>

-    </function>

-

-    <function name="Uniform4uiEXT" offset="assign">

-        <param name="location" type="GLint"/>

-        <param name="x" type="GLuint"/>

-        <param name="y" type="GLuint"/>

-        <param name="z" type="GLuint"/>

-        <param name="w" type="GLuint"/>

-    </function>

-

-    <function name="Uniform1uivEXT" offset="assign">

-        <param name="location" type="GLint"/>

-	<param name="count" type="GLsizei"/>

-        <param name="value" type="const GLuint *"/>

-    </function>

-

-    <function name="Uniform2uivEXT" offset="assign">

-        <param name="location" type="GLint"/>

-	<param name="count" type="GLsizei"/>

-        <param name="value" type="const GLuint *"/>

-    </function>

-

-    <function name="Uniform3uivEXT" offset="assign">

-        <param name="location" type="GLint"/>

-	<param name="count" type="GLsizei"/>

-        <param name="value" type="const GLuint *"/>

-    </function>

-

-    <function name="Uniform4uivEXT" offset="assign">

-        <param name="location" type="GLint"/>

-	<param name="count" type="GLsizei"/>

-        <param name="value" type="const GLuint *"/>

-    </function>

-

-    <function name="GetUniformuivEXT" offset="assign">

-        <param name="program" type="GLuint"/>

-        <param name="location" type="GLint"/>

-        <param name="params" type="GLuint *"/>

-    </function>

-

-    <function name="BindFragDataLocationEXT" offset="assign">

-        <param name="program" type="GLuint"/>

-        <param name="colorNumber" type="GLuint"/>

-        <param name="name" type="const GLchar *"/>

-    </function>

-

-    <function name="GetFragDataLocationEXT" offset="assign">

-	<return type="GLint"/>

-        <param name="program" type="GLuint"/>

-        <param name="name" type="const GLchar *"/>

-    </function>

-

-</category>

-

-</OpenGLAPI>

+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_EXT_gpu_shader4" number="326">
+
+    <enum name="VERTEX_ATTRIB_ARRAY_INTEGER_EXT"        value="0x88FD"/>
+    <enum name="SAMPLER_1D_ARRAY_EXT"                   value="0x8DC0"/>
+    <enum name="SAMPLER_2D_ARRAY_EXT"                   value="0x8DC1"/>
+    <enum name="SAMPLER_BUFFER_EXT"                     value="0x8DC2"/>
+    <enum name="SAMPLER_1D_ARRAY_SHADOW_EXT"            value="0x8DC3"/>
+    <enum name="SAMPLER_2D_ARRAY_SHADOW_EXT"            value="0x8DC4"/>
+    <enum name="SAMPLER_CUBE_SHADOW_EXT"                value="0x8DC5"/>
+    <enum name="UNSIGNED_INT_VEC2_EXT"                  value="0x8DC6"/>
+    <enum name="UNSIGNED_INT_VEC3_EXT"                  value="0x8DC7"/>
+    <enum name="UNSIGNED_INT_VEC4_EXT"                  value="0x8DC8"/>
+    <enum name="INT_SAMPLER_1D_EXT"                     value="0x8DC9"/>
+    <enum name="INT_SAMPLER_2D_EXT"                     value="0x8DCA"/>
+    <enum name="INT_SAMPLER_3D_EXT"                     value="0x8DCB"/>
+    <enum name="INT_SAMPLER_CUBE_EXT"                   value="0x8DCC"/>
+    <enum name="INT_SAMPLER_2D_RECT_EXT"                value="0x8DCD"/>
+    <enum name="INT_SAMPLER_1D_ARRAY_EXT"               value="0x8DCE"/>
+    <enum name="INT_SAMPLER_2D_ARRAY_EXT"               value="0x8DCF"/>
+    <enum name="INT_SAMPLER_BUFFER_EXT"                 value="0x8DD0"/>
+    <enum name="UNSIGNED_INT_SAMPLER_1D_EXT"            value="0x8DD1"/>
+    <enum name="UNSIGNED_INT_SAMPLER_2D_EXT"            value="0x8DD2"/>
+    <enum name="UNSIGNED_INT_SAMPLER_3D_EXT"            value="0x8DD3"/>
+    <enum name="UNSIGNED_INT_SAMPLER_CUBE_EXT"          value="0x8DD4"/>
+    <enum name="UNSIGNED_INT_SAMPLER_2D_RECT_EXT"       value="0x8DD5"/>
+    <enum name="UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT"      value="0x8DD6"/>
+    <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"      value="0x8DD7"/>
+    <enum name="UNSIGNED_INT_SAMPLER_BUFFER_EXT"        value="0x8DD8"/>
+
+    <!-- There is no MIN_PROGRAM_TEXEL_OFFSET_EXT in glext.h.  There is
+         MIN_PROGRAM_TEXEL_OFFSET_NV and MIN_PROGRAM_TEXEL_OFFSET (OpenGL
+         3.0).  Same goes for MAX_PROGRAM_TEXEL_OFFSET_EXT.
+    -->
+    <enum name="MIN_PROGRAM_TEXEL_OFFSET"               value="0x8904">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="MAX_PROGRAM_TEXEL_OFFSET"               value="0x8905">
+        <size name="Get" mode="get"/>
+    </enum>
+
+
+    <function name="VertexAttribI1iEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLint"/>
+    </function>
+
+    <function name="VertexAttribI2iEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLint"/>
+        <param name="y" type="GLint"/>
+    </function>
+
+    <function name="VertexAttribI3iEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLint"/>
+        <param name="y" type="GLint"/>
+        <param name="z" type="GLint"/>
+    </function>
+
+    <function name="VertexAttribI4iEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLint"/>
+        <param name="y" type="GLint"/>
+        <param name="z" type="GLint"/>
+        <param name="w" type="GLint"/>
+    </function>
+
+    <function name="VertexAttribI1uiEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribI2uiEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribI3uiEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+        <param name="z" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribI4uiEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+        <param name="z" type="GLuint"/>
+        <param name="w" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribI1ivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLint *"/>
+    </function>
+
+    <function name="VertexAttribI2ivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLint *"/>
+    </function>
+
+    <function name="VertexAttribI3ivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLint *"/>
+    </function>
+
+    <function name="VertexAttribI4ivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLint *"/>
+    </function>
+
+    <function name="VertexAttribI1uivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribI2uivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribI3uivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribI4uivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribI4bvEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLbyte *"/>
+    </function>
+
+    <function name="VertexAttribI4svEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLshort *"/>
+    </function>
+
+    <function name="VertexAttribI4ubvEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLubyte *"/>
+    </function>
+
+    <function name="VertexAttribI4usvEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="v" type="const GLushort *"/>
+    </function>
+
+    <function name="VertexAttribIPointerEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="size" type="GLint"/>
+        <param name="type" type="GLenum"/>
+        <param name="stride" type="GLsizei"/>
+        <param name="pointer" type="const GLvoid *"/>
+    </function>
+
+    <function name="GetVertexAttribIivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLint *"/>
+    </function>
+
+    <function name="GetVertexAttribIuivEXT" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLuint *"/>
+    </function>
+
+    <function name="Uniform1uiEXT" offset="assign">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint"/>
+    </function>
+
+    <function name="Uniform2uiEXT" offset="assign">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+    </function>
+
+    <function name="Uniform3uiEXT" offset="assign">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+        <param name="z" type="GLuint"/>
+    </function>
+
+    <function name="Uniform4uiEXT" offset="assign">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint"/>
+        <param name="y" type="GLuint"/>
+        <param name="z" type="GLuint"/>
+        <param name="w" type="GLuint"/>
+    </function>
+
+    <function name="Uniform1uivEXT" offset="assign">
+        <param name="location" type="GLint"/>
+	<param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="Uniform2uivEXT" offset="assign">
+        <param name="location" type="GLint"/>
+	<param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="Uniform3uivEXT" offset="assign">
+        <param name="location" type="GLint"/>
+	<param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="Uniform4uivEXT" offset="assign">
+        <param name="location" type="GLint"/>
+	<param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="GetUniformuivEXT" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="params" type="GLuint *"/>
+    </function>
+
+    <function name="BindFragDataLocationEXT" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="colorNumber" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+    </function>
+
+    <function name="GetFragDataLocationEXT" offset="assign">
+	<return type="GLint"/>
+        <param name="program" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 4110cda7b..c409285dd 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -41,21 +41,13 @@ MESA_OUTPUTS = \
 XORG_GLX_DIR = $(XORG_BASE)/glx
 XORG_GLAPI_DIR = $(XORG_BASE)/glx
 
-XORG_GLAPI_FILES = \
-	$(XORG_GLAPI_DIR)/glapi_getproc.c \
-	$(XORG_GLAPI_DIR)/glapi_nop.c \
-	$(XORG_GLAPI_DIR)/glthread.c \
-	$(XORG_GLAPI_DIR)/glthread.h
-
 XORG_GLAPI_OUTPUTS = \
 	$(XORG_GLAPI_DIR)/glprocs.h \
-	$(XORG_GLAPI_DIR)/glapioffsets.h \
 	$(XORG_GLAPI_DIR)/glapitable.h \
-	$(XORG_GLAPI_DIR)/glapidispatch.h \
+	$(XORG_GLAPI_DIR)/dispatch.h \
 	$(XORG_GLAPI_DIR)/glapi_gentable.c
 
 XORG_OUTPUTS = \
-	$(XORG_GLAPI_FILES) \
 	$(XORG_GLAPI_OUTPUTS) \
 	$(XORG_GLX_DIR)/indirect_dispatch.c \
 	$(XORG_GLX_DIR)/indirect_dispatch_swap.c \
@@ -148,6 +140,9 @@ clean:
 $(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c
 	cp $< $@
 
+$(XORG_GLAPI_DIR)/dispatch.h: $(MESA_DIR)/main/dispatch.h
+	cp $< $@
+
 $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
 	cp $< $@
 
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
index 190ba8132..65674dab7 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
@@ -1,566 +1,567 @@
-#!/usr/bin/env python

-

-# (C) Copyright IBM Corporation 2005

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

-# on the rights to use, copy, modify, merge, publish, distribute, sub

-# license, and/or sell copies of the Software, and to permit persons to whom

-# the Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

-# IBM AND/OR ITS SUPPLIERS 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.

-#

-# Authors:

-#    Ian Romanick <idr@us.ibm.com>

-

-import gl_XML, glX_XML, glX_proto_common, license

-import sys, getopt, string

-

-

-class PrintGlxDispatch_h(gl_XML.gl_print_base):

-	def __init__(self):

-		gl_XML.gl_print_base.__init__(self)

-

-		self.name = "glX_proto_recv.py (from Mesa)"

-		self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM")

-

-		self.header_tag = "_INDIRECT_DISPATCH_H_"

-		return

-

-

-	def printRealHeader(self):

-		self.printVisibility( "HIDDEN", "hidden" )

-		print 'struct __GLXclientStateRec;'

-		print ''

-		return

-

-

-	def printBody(self, api):

-		for func in api.functionIterateAll():

-			if not func.ignore and not func.vectorequiv:

-				if func.glx_rop:

-					print 'extern HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name)

-					print 'extern HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name)

-				elif func.glx_sop or func.glx_vendorpriv:

-					print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)

-					print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)

-

-					if func.glx_sop and func.glx_vendorpriv:

-						n = func.glx_vendorpriv_names[0]

-						print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)

-						print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)

-

-		return

-

-

-class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):

-	def __init__(self, do_swap):

-		gl_XML.gl_print_base.__init__(self)

-		self.name = "glX_proto_recv.py (from Mesa)"

-		self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM")

-

-		self.real_types = [ '', '', 'uint16_t', '', 'uint32_t', '', '', '', 'uint64_t' ]

-		self.do_swap = do_swap

-		return

-

-

-	def printRealHeader(self):

-		print '#ifdef HAVE_DIX_CONFIG_H'

-		print '#include <dix-config.h>'

-		print '#else'

-		print ''

-		print '#include "glheader.h"'

-		print ''

-		print '#endif'

-		print ''

-		print '#include <X11/Xmd.h>'

-		print '#include <GL/gl.h>'

-		print '#include <GL/glxproto.h>'

-

-		print '#include <inttypes.h>'

-		print '#include "indirect_size.h"'

-		print '#include "indirect_size_get.h"'

-		print '#include "indirect_dispatch.h"'

-		print '#include "glxserver.h"'

-		print '#include "glxbyteorder.h"'

-		print '#include "indirect_util.h"'

-		print '#include "singlesize.h"'

-		print '#include "glapi.h"'

-		print '#include "glapitable.h"'

-		print '#include "glthread.h"'

-		print '#include "dispatch.h"'

-		print ''

-		print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'

-		print ''

-		print 'typedef struct {'

-		print '    __GLX_PIXEL_3D_HDR;'

-		print '} __GLXpixel3DHeader;'

-		print ''

-		print 'extern GLboolean __glXErrorOccured( void );'

-		print 'extern void __glXClearErrorOccured( void );'

-		print ''

-		print 'static const unsigned dummy_answer[2] = {0, 0};'

-		print ''

-		return

-

-

-	def printBody(self, api):

-		if self.do_swap:

-			self.emit_swap_wrappers(api)

-

-

-		for func in api.functionIterateByOffset():

-			if not func.ignore and not func.server_handcode and not func.vectorequiv and (func.glx_rop or func.glx_sop or func.glx_vendorpriv):

-				self.printFunction(func, func.name)

-				if func.glx_sop and func.glx_vendorpriv:

-					self.printFunction(func, func.glx_vendorpriv_names[0])

-					

-

-		return

-

-

-	def printFunction(self, f, name):

-		if (f.glx_sop or f.glx_vendorpriv) and (len(f.get_images()) != 0):

-			return

-

-		if not self.do_swap:

-			base = '__glXDisp'

-		else:

-			base = '__glXDispSwap'

-

-		if f.glx_rop:

-			print 'void %s_%s(GLbyte * pc)' % (base, name)

-		else:

-			print 'int %s_%s(__GLXclientState *cl, GLbyte *pc)' % (base, name)

-

-		print '{'

-

-		if f.glx_rop or f.vectorequiv:

-			self.printRenderFunction(f)

-		elif f.glx_sop or f.glx_vendorpriv:

-			if len(f.get_images()) == 0: 

-				self.printSingleFunction(f, name)

-		else:

-			print "/* Missing GLX protocol for %s. */" % (name)

-

-		print '}'

-		print ''

-		return

-

-

-	def swap_name(self, bytes):

-		return 'bswap_%u_array' % (8 * bytes)

-

-

-	def emit_swap_wrappers(self, api):

-		self.type_map = {}

-		already_done = [ ]

-

-		for t in api.typeIterate():

-			te = t.get_type_expression()

-			t_size = te.get_element_size()

-

-			if t_size > 1 and t.glx_name:

-				

-				t_name = "GL" + t.name

-				self.type_map[ t_name ] = t.glx_name

-

-				if t.glx_name not in already_done:

-					real_name = self.real_types[t_size]

-

-					print 'static %s' % (t_name)

-					print 'bswap_%s( const void * src )' % (t.glx_name)

-					print '{'

-					print '    union { %s dst; %s ret; } x;' % (real_name, t_name)

-					print '    x.dst = bswap_%u( *(%s *) src );' % (t_size * 8, real_name)

-					print '    return x.ret;'

-					print '}'

-					print ''

-					already_done.append( t.glx_name )

-

-		for bits in [16, 32, 64]:

-			print 'static void *'

-			print 'bswap_%u_array( uint%u_t * src, unsigned count )' % (bits, bits)

-			print '{'

-			print '    unsigned  i;'

-			print ''

-			print '    for ( i = 0 ; i < count ; i++ ) {'

-			print '        uint%u_t temp = bswap_%u( src[i] );' % (bits, bits)

-			print '        src[i] = temp;'

-			print '    }'

-			print ''

-			print '    return src;'

-			print '}'

-			print ''

-			

-

-	def fetch_param(self, param):

-		t = param.type_string()

-		o = param.offset

-		element_size = param.size() / param.get_element_count()

-

-		if self.do_swap and (element_size != 1):

-			if param.is_array():

-				real_name = self.real_types[ element_size ]

-

-				swap_func = self.swap_name( element_size )

-				return ' (%-8s)%s( (%s *) (pc + %2s), %s )' % (t, swap_func, real_name, o, param.count)

-			else:

-				t_name = param.get_base_type_string()

-				return ' (%-8s)bswap_%-7s( pc + %2s )' % (t, self.type_map[ t_name ], o)

-		else:

-			if param.is_array():

-				return ' (%-8s)(pc + %2u)' % (t, o)

-			else:

-				return '*(%-8s *)(pc + %2u)' % (t, o)

-				

-		return None

-

-

-	def emit_function_call(self, f, retval_assign, indent):

-		list = []

-

-		for param in f.parameterIterator():

-			if param.is_padding:

-				continue

-

-			if param.is_counter or param.is_image() or param.is_output or param.name in f.count_parameter_list or len(param.count_parameter_list):

-				location = param.name

-			else:

-				location = self.fetch_param(param)

-

-			list.append( '%s        %s' % (indent, location) )

-			

-

-		if len( list ):

-			print '%s    %sCALL_%s( GET_DISPATCH(), (' % (indent, retval_assign, f.name)

-			print string.join( list, ",\n" )

-			print '%s    ) );' % (indent)

-		else:

-			print '%s    %sCALL_%s( GET_DISPATCH(), () );' % (indent, retval_assign, f.name)

-		return

-

-

-	def common_func_print_just_start(self, f, indent):

-		align64 = 0

-		need_blank = 0

-

-

-		f.calculate_offsets()

-		for param in f.parameterIterateGlxSend():

-			# If any parameter has a 64-bit base type, then we

-			# have to do alignment magic for the while thing.

-

-			if param.is_64_bit():

-				align64 = 1

-

-

-			# FIXME img_null_flag is over-loaded.  In addition to

-			# FIXME being used for images, it is used to signify

-			# FIXME NULL data pointers for vertex buffer object

-			# FIXME related functions.  Re-name it to null_data

-			# FIXME or something similar.

-

-			if param.img_null_flag:

-				print '%s    const CARD32 ptr_is_null = *(CARD32 *)(pc + %s);' % (indent, param.offset - 4)

-				cond = '(ptr_is_null != 0) ? NULL : '

-			else:

-				cond = ""

-

-

-			type_string = param.type_string()

-

-			if param.is_image():

-				offset = f.offset_of( param.name )

-

-				if cond:

-					print '%s    %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset)

-				else:

-					print '%s    %s const %s = (%s) (pc + %s);' % (indent, type_string, param.name, type_string, offset)

-				

-				if param.depth:

-					print '%s    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);' % (indent)

-				else:

-					print '%s    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);' % (indent)

-

-				need_blank = 1

-			elif param.is_counter or param.name in f.count_parameter_list:

-				location = self.fetch_param(param)

-				print '%s    const %s %s = %s;' % (indent, type_string, param.name, location)

-				need_blank = 1

-			elif len(param.count_parameter_list):

-				if param.size() == 1 and not self.do_swap:

-					location = self.fetch_param(param)

-					print '%s    %s %s = %s%s;' % (indent, type_string, param.name, cond, location)

-				else:

-					print '%s    %s %s;' % (indent, type_string, param.name)

-				need_blank = 1

-

-

-

-		if need_blank:

-			print ''

-

-		if align64:

-			print '#ifdef __GLX_ALIGN64'

-

-			if f.has_variable_size_request():

-				self.emit_packet_size_calculation(f, 4)

-				s = "cmdlen"

-			else:

-				s = str((f.command_fixed_length() + 3) & ~3)

-

-			print '    if ((unsigned long)(pc) & 7) {'

-			print '        (void) memmove(pc-4, pc, %s);' % (s)

-			print '        pc -= 4;'

-			print '    }'

-			print '#endif'

-			print ''

-

-

-		need_blank = 0

-		if self.do_swap:

-			for param in f.parameterIterateGlxSend():

-				if param.count_parameter_list:

-					o = param.offset

-					count = param.get_element_count()

-					type_size = param.size() / count

-					

-					if param.counter:

-						count_name = param.counter

-					else:

-						count_name = str(count)

-

-					# This is basically an ugly special-

-					# case for glCallLists.

-

-					if type_size == 1:

-						x = [] 

-						x.append( [1, ['BYTE', 'UNSIGNED_BYTE', '2_BYTES', '3_BYTES', '4_BYTES']] )

-						x.append( [2, ['SHORT', 'UNSIGNED_SHORT']] )

-						x.append( [4, ['INT', 'UNSIGNED_INT', 'FLOAT']] )

-

-						print '    switch(%s) {' % (param.count_parameter_list[0])

-						for sub in x:

-							for t_name in sub[1]:

-								print '    case GL_%s:' % (t_name)

-

-							if sub[0] == 1:

-								print '        %s = (%s) (pc + %s); break;' % (param.name, param.type_string(), o)

-							else:

-								swap_func = self.swap_name(sub[0])

-								print '        %s = (%s) %s( (%s *) (pc + %s), %s ); break;' % (param.name, param.type_string(), swap_func, self.real_types[sub[0]], o, count_name)

-						print '    default:'

-						print '        return;'

-						print '    }'

-					else:

-						swap_func = self.swap_name(type_size)

-						compsize = self.size_call(f, 1)

-						print '    %s = (%s) %s( (%s *) (pc + %s), %s );' % (param.name, param.type_string(), swap_func, self.real_types[type_size], o, compsize)

-

-					need_blank = 1

-

-		else:

-			for param in f.parameterIterateGlxSend():

-				if param.count_parameter_list:

-					if param.size() != 1 or self.do_swap:

-						print '%s    %s = (%s) (pc + %s);' % (indent, param.name, param.type_string(), param.offset)

-						need_blank = 1

-

-

-		if need_blank:

-			print ''

-

-

-		return

-

-

-	def printSingleFunction(self, f, name):

-		if name not in f.glx_vendorpriv_names:

-			print '    xGLXSingleReq * const req = (xGLXSingleReq *) pc;'

-		else:

-			print '    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;'

-

-		print '    int error;'

-

-		if self.do_swap:

-		    print '    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);'

-		else:

-		    print '    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);'

-

-		print ''

-		if name not in f.glx_vendorpriv_names:

-			print '    pc += __GLX_SINGLE_HDR_SIZE;'

-		else:

-			print '    pc += __GLX_VENDPRIV_HDR_SIZE;'

-

-		print '    if ( cx != NULL ) {'

-		self.common_func_print_just_start(f, "    ")

-		

-

-		if f.return_type != 'void':

-			print '        %s retval;' % (f.return_type)

-			retval_string = "retval"

-			retval_assign = "retval = "

-		else:

-			retval_string = "0"

-			retval_assign = ""

-

-

-		type_size = 0

-		answer_string = "dummy_answer"

-		answer_count = "0"

-		is_array_string = "GL_FALSE"

-

-		for param in f.parameterIterateOutputs():

-			answer_type = param.get_base_type_string()

-			if answer_type == "GLvoid":

-				answer_type = "GLubyte"

-

-

-			c = param.get_element_count()

-			type_size = (param.size() / c)

-			if type_size == 1:

-				size_scale = ""

-			else:

-				size_scale = " * %u" % (type_size)

-

-

-			if param.count_parameter_list:

-				print '        const GLuint compsize = %s;' % (self.size_call(f, 1))

-				print '        %s answerBuffer[200];' %  (answer_type)

-				print '        %s %s = __glXGetAnswerBuffer(cl, compsize%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, size_scale, type_size )

-				answer_string = param.name

-				answer_count = "compsize"

-

-				print ''

-				print '        if (%s == NULL) return BadAlloc;' % (param.name)

-				print '        __glXClearErrorOccured();'

-				print ''

-			elif param.counter:

-				print '        %s answerBuffer[200];' %  (answer_type)

-				print '        %s %s = __glXGetAnswerBuffer(cl, %s%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, param.counter, size_scale, type_size)

-				answer_string = param.name

-				answer_count = param.counter

-			elif c >= 1:

-				print '        %s %s[%u];' % (answer_type, param.name, c)

-				answer_string = param.name

-				answer_count = "%u" % (c)

-

-			if f.reply_always_array:

-				is_array_string = "GL_TRUE"

-

-

-		self.emit_function_call(f, retval_assign, "    ")

-

-

-		if f.needs_reply():

-			if self.do_swap:

-				for param in f.parameterIterateOutputs():

-					c = param.get_element_count()

-					type_size = (param.size() / c)

-

-					if type_size > 1:

-						swap_name = self.swap_name( type_size )

-						print '        (void) %s( (uint%u_t *) %s, %s );' % (swap_name, 8 * type_size, param.name, answer_count)

-

-

-				reply_func = '__glXSendReplySwap'

-			else:

-				reply_func = '__glXSendReply'

-

-			print '        %s(cl->client, %s, %s, %u, %s, %s);' % (reply_func, answer_string, answer_count, type_size, is_array_string, retval_string)

-		#elif f.note_unflushed:

-		#	print '        cx->hasUnflushedCommands = GL_TRUE;'

-

-		print '        error = Success;'

-		print '    }'

-		print ''

-		print '    return error;'

-		return

-

-

-	def printRenderFunction(self, f):

-		# There are 4 distinct phases in a rendering dispatch function.

-		# In the first phase we compute the sizes and offsets of each

-		# element in the command.  In the second phase we (optionally)

-		# re-align 64-bit data elements.  In the third phase we

-		# (optionally) byte-swap array data.  Finally, in the fourth

-		# phase we actually dispatch the function.

-

-		self.common_func_print_just_start(f, "")

-

-		images = f.get_images()

-		if len(images):

-			if self.do_swap:

-				pre = "bswap_CARD32( & "

-				post = " )"

-			else:

-				pre = ""

-				post = ""

-

-			img = images[0]

-

-			# swapBytes and lsbFirst are single byte fields, so

-			# the must NEVER be byte-swapped.

-

-			if not (img.img_type == "GL_BITMAP" and img.img_format == "GL_COLOR_INDEX"):

-				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );'

-

-			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );'

-

-			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) %shdr->rowLength%s) );' % (pre, post)

-			if img.depth:

-				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) %shdr->imageHeight%s) );' % (pre, post)

-			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) %shdr->skipRows%s) );' % (pre, post)

-			if img.depth:

-				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) %shdr->skipImages%s) );' % (pre, post)

-			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) %shdr->skipPixels%s) );' % (pre, post)

-			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) %shdr->alignment%s) );' % (pre, post)

-			print ''

-

-

-		self.emit_function_call(f, "", "")

-		return

-

-

-if __name__ == '__main__':

-	file_name = "gl_API.xml"

-

-	try:

-		(args, trail) = getopt.getopt(sys.argv[1:], "f:m:s")

-	except Exception,e:

-		show_usage()

-

-	mode = "dispatch_c"

-	do_swap = 0

-	for (arg,val) in args:

-		if arg == "-f":

-			file_name = val

-		elif arg == "-m":

-			mode = val

-		elif arg == "-s":

-			do_swap = 1

-

-	if mode == "dispatch_c":

-		printer = PrintGlxDispatchFunctions(do_swap)

-	elif mode == "dispatch_h":

-		printer = PrintGlxDispatch_h()

-	else:

-		show_usage()

-

-	api = gl_XML.parse_GL_API( file_name, glX_proto_common.glx_proto_item_factory() )

-

-	printer.Print( api )

+#!/usr/bin/env python
+
+# (C) Copyright IBM Corporation 2005
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+# IBM AND/OR ITS SUPPLIERS 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.
+#
+# Authors:
+#    Ian Romanick <idr@us.ibm.com>
+
+import gl_XML, glX_XML, glX_proto_common, license
+import sys, getopt, string
+
+
+class PrintGlxDispatch_h(gl_XML.gl_print_base):
+	def __init__(self):
+		gl_XML.gl_print_base.__init__(self)
+
+		self.name = "glX_proto_recv.py (from Mesa)"
+		self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM")
+
+		self.header_tag = "_INDIRECT_DISPATCH_H_"
+		return
+
+
+	def printRealHeader(self):
+		print '#  include <X11/Xfuncproto.h>'
+		print ''
+		print 'struct __GLXclientStateRec;'
+		print ''
+		return
+
+
+	def printBody(self, api):
+		for func in api.functionIterateAll():
+			if not func.ignore and not func.vectorequiv:
+				if func.glx_rop:
+					print 'extern _X_HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name)
+					print 'extern _X_HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name)
+				elif func.glx_sop or func.glx_vendorpriv:
+					print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
+					print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
+
+					if func.glx_sop and func.glx_vendorpriv:
+						n = func.glx_vendorpriv_names[0]
+						print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
+						print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
+
+		return
+
+
+class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
+	def __init__(self, do_swap):
+		gl_XML.gl_print_base.__init__(self)
+		self.name = "glX_proto_recv.py (from Mesa)"
+		self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM")
+
+		self.real_types = [ '', '', 'uint16_t', '', 'uint32_t', '', '', '', 'uint64_t' ]
+		self.do_swap = do_swap
+		return
+
+
+	def printRealHeader(self):
+		print '#ifdef HAVE_DIX_CONFIG_H'
+		print '#include <dix-config.h>'
+		print '#else'
+		print ''
+		print '#include "glheader.h"'
+		print ''
+		print '#endif'
+		print ''
+		print '#include <X11/Xmd.h>'
+		print '#include <GL/gl.h>'
+		print '#include <GL/glxproto.h>'
+
+		print '#include <inttypes.h>'
+		print '#include "indirect_size.h"'
+		print '#include "indirect_size_get.h"'
+		print '#include "indirect_dispatch.h"'
+		print '#include "glxserver.h"'
+		print '#include "glxbyteorder.h"'
+		print '#include "indirect_util.h"'
+		print '#include "singlesize.h"'
+		print '#include "glapi.h"'
+		print '#include "glapitable.h"'
+		print '#include "glthread.h"'
+		print '#include "dispatch.h"'
+		print ''
+		print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'
+		print ''
+		print 'typedef struct {'
+		print '    __GLX_PIXEL_3D_HDR;'
+		print '} __GLXpixel3DHeader;'
+		print ''
+		print 'extern GLboolean __glXErrorOccured( void );'
+		print 'extern void __glXClearErrorOccured( void );'
+		print ''
+		print 'static const unsigned dummy_answer[2] = {0, 0};'
+		print ''
+		return
+
+
+	def printBody(self, api):
+		if self.do_swap:
+			self.emit_swap_wrappers(api)
+
+
+		for func in api.functionIterateByOffset():
+			if not func.ignore and not func.server_handcode and not func.vectorequiv and (func.glx_rop or func.glx_sop or func.glx_vendorpriv):
+				self.printFunction(func, func.name)
+				if func.glx_sop and func.glx_vendorpriv:
+					self.printFunction(func, func.glx_vendorpriv_names[0])
+					
+
+		return
+
+
+	def printFunction(self, f, name):
+		if (f.glx_sop or f.glx_vendorpriv) and (len(f.get_images()) != 0):
+			return
+
+		if not self.do_swap:
+			base = '__glXDisp'
+		else:
+			base = '__glXDispSwap'
+
+		if f.glx_rop:
+			print 'void %s_%s(GLbyte * pc)' % (base, name)
+		else:
+			print 'int %s_%s(__GLXclientState *cl, GLbyte *pc)' % (base, name)
+
+		print '{'
+
+		if f.glx_rop or f.vectorequiv:
+			self.printRenderFunction(f)
+		elif f.glx_sop or f.glx_vendorpriv:
+			if len(f.get_images()) == 0: 
+				self.printSingleFunction(f, name)
+		else:
+			print "/* Missing GLX protocol for %s. */" % (name)
+
+		print '}'
+		print ''
+		return
+
+
+	def swap_name(self, bytes):
+		return 'bswap_%u_array' % (8 * bytes)
+
+
+	def emit_swap_wrappers(self, api):
+		self.type_map = {}
+		already_done = [ ]
+
+		for t in api.typeIterate():
+			te = t.get_type_expression()
+			t_size = te.get_element_size()
+
+			if t_size > 1 and t.glx_name:
+				
+				t_name = "GL" + t.name
+				self.type_map[ t_name ] = t.glx_name
+
+				if t.glx_name not in already_done:
+					real_name = self.real_types[t_size]
+
+					print 'static %s' % (t_name)
+					print 'bswap_%s( const void * src )' % (t.glx_name)
+					print '{'
+					print '    union { %s dst; %s ret; } x;' % (real_name, t_name)
+					print '    x.dst = bswap_%u( *(%s *) src );' % (t_size * 8, real_name)
+					print '    return x.ret;'
+					print '}'
+					print ''
+					already_done.append( t.glx_name )
+
+		for bits in [16, 32, 64]:
+			print 'static void *'
+			print 'bswap_%u_array( uint%u_t * src, unsigned count )' % (bits, bits)
+			print '{'
+			print '    unsigned  i;'
+			print ''
+			print '    for ( i = 0 ; i < count ; i++ ) {'
+			print '        uint%u_t temp = bswap_%u( src[i] );' % (bits, bits)
+			print '        src[i] = temp;'
+			print '    }'
+			print ''
+			print '    return src;'
+			print '}'
+			print ''
+			
+
+	def fetch_param(self, param):
+		t = param.type_string()
+		o = param.offset
+		element_size = param.size() / param.get_element_count()
+
+		if self.do_swap and (element_size != 1):
+			if param.is_array():
+				real_name = self.real_types[ element_size ]
+
+				swap_func = self.swap_name( element_size )
+				return ' (%-8s)%s( (%s *) (pc + %2s), %s )' % (t, swap_func, real_name, o, param.count)
+			else:
+				t_name = param.get_base_type_string()
+				return ' (%-8s)bswap_%-7s( pc + %2s )' % (t, self.type_map[ t_name ], o)
+		else:
+			if param.is_array():
+				return ' (%-8s)(pc + %2u)' % (t, o)
+			else:
+				return '*(%-8s *)(pc + %2u)' % (t, o)
+				
+		return None
+
+
+	def emit_function_call(self, f, retval_assign, indent):
+		list = []
+
+		for param in f.parameterIterator():
+			if param.is_padding:
+				continue
+
+			if param.is_counter or param.is_image() or param.is_output or param.name in f.count_parameter_list or len(param.count_parameter_list):
+				location = param.name
+			else:
+				location = self.fetch_param(param)
+
+			list.append( '%s        %s' % (indent, location) )
+			
+
+		if len( list ):
+			print '%s    %sCALL_%s( GET_DISPATCH(), (' % (indent, retval_assign, f.name)
+			print string.join( list, ",\n" )
+			print '%s    ) );' % (indent)
+		else:
+			print '%s    %sCALL_%s( GET_DISPATCH(), () );' % (indent, retval_assign, f.name)
+		return
+
+
+	def common_func_print_just_start(self, f, indent):
+		align64 = 0
+		need_blank = 0
+
+
+		f.calculate_offsets()
+		for param in f.parameterIterateGlxSend():
+			# If any parameter has a 64-bit base type, then we
+			# have to do alignment magic for the while thing.
+
+			if param.is_64_bit():
+				align64 = 1
+
+
+			# FIXME img_null_flag is over-loaded.  In addition to
+			# FIXME being used for images, it is used to signify
+			# FIXME NULL data pointers for vertex buffer object
+			# FIXME related functions.  Re-name it to null_data
+			# FIXME or something similar.
+
+			if param.img_null_flag:
+				print '%s    const CARD32 ptr_is_null = *(CARD32 *)(pc + %s);' % (indent, param.offset - 4)
+				cond = '(ptr_is_null != 0) ? NULL : '
+			else:
+				cond = ""
+
+
+			type_string = param.type_string()
+
+			if param.is_image():
+				offset = f.offset_of( param.name )
+
+				if cond:
+					print '%s    %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset)
+				else:
+					print '%s    %s const %s = (%s) (pc + %s);' % (indent, type_string, param.name, type_string, offset)
+				
+				if param.depth:
+					print '%s    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);' % (indent)
+				else:
+					print '%s    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);' % (indent)
+
+				need_blank = 1
+			elif param.is_counter or param.name in f.count_parameter_list:
+				location = self.fetch_param(param)
+				print '%s    const %s %s = %s;' % (indent, type_string, param.name, location)
+				need_blank = 1
+			elif len(param.count_parameter_list):
+				if param.size() == 1 and not self.do_swap:
+					location = self.fetch_param(param)
+					print '%s    %s %s = %s%s;' % (indent, type_string, param.name, cond, location)
+				else:
+					print '%s    %s %s;' % (indent, type_string, param.name)
+				need_blank = 1
+
+
+
+		if need_blank:
+			print ''
+
+		if align64:
+			print '#ifdef __GLX_ALIGN64'
+
+			if f.has_variable_size_request():
+				self.emit_packet_size_calculation(f, 4)
+				s = "cmdlen"
+			else:
+				s = str((f.command_fixed_length() + 3) & ~3)
+
+			print '    if ((unsigned long)(pc) & 7) {'
+			print '        (void) memmove(pc-4, pc, %s);' % (s)
+			print '        pc -= 4;'
+			print '    }'
+			print '#endif'
+			print ''
+
+
+		need_blank = 0
+		if self.do_swap:
+			for param in f.parameterIterateGlxSend():
+				if param.count_parameter_list:
+					o = param.offset
+					count = param.get_element_count()
+					type_size = param.size() / count
+					
+					if param.counter:
+						count_name = param.counter
+					else:
+						count_name = str(count)
+
+					# This is basically an ugly special-
+					# case for glCallLists.
+
+					if type_size == 1:
+						x = [] 
+						x.append( [1, ['BYTE', 'UNSIGNED_BYTE', '2_BYTES', '3_BYTES', '4_BYTES']] )
+						x.append( [2, ['SHORT', 'UNSIGNED_SHORT']] )
+						x.append( [4, ['INT', 'UNSIGNED_INT', 'FLOAT']] )
+
+						print '    switch(%s) {' % (param.count_parameter_list[0])
+						for sub in x:
+							for t_name in sub[1]:
+								print '    case GL_%s:' % (t_name)
+
+							if sub[0] == 1:
+								print '        %s = (%s) (pc + %s); break;' % (param.name, param.type_string(), o)
+							else:
+								swap_func = self.swap_name(sub[0])
+								print '        %s = (%s) %s( (%s *) (pc + %s), %s ); break;' % (param.name, param.type_string(), swap_func, self.real_types[sub[0]], o, count_name)
+						print '    default:'
+						print '        return;'
+						print '    }'
+					else:
+						swap_func = self.swap_name(type_size)
+						compsize = self.size_call(f, 1)
+						print '    %s = (%s) %s( (%s *) (pc + %s), %s );' % (param.name, param.type_string(), swap_func, self.real_types[type_size], o, compsize)
+
+					need_blank = 1
+
+		else:
+			for param in f.parameterIterateGlxSend():
+				if param.count_parameter_list:
+					if param.size() != 1 or self.do_swap:
+						print '%s    %s = (%s) (pc + %s);' % (indent, param.name, param.type_string(), param.offset)
+						need_blank = 1
+
+
+		if need_blank:
+			print ''
+
+
+		return
+
+
+	def printSingleFunction(self, f, name):
+		if name not in f.glx_vendorpriv_names:
+			print '    xGLXSingleReq * const req = (xGLXSingleReq *) pc;'
+		else:
+			print '    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;'
+
+		print '    int error;'
+
+		if self.do_swap:
+		    print '    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);'
+		else:
+		    print '    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);'
+
+		print ''
+		if name not in f.glx_vendorpriv_names:
+			print '    pc += __GLX_SINGLE_HDR_SIZE;'
+		else:
+			print '    pc += __GLX_VENDPRIV_HDR_SIZE;'
+
+		print '    if ( cx != NULL ) {'
+		self.common_func_print_just_start(f, "    ")
+		
+
+		if f.return_type != 'void':
+			print '        %s retval;' % (f.return_type)
+			retval_string = "retval"
+			retval_assign = "retval = "
+		else:
+			retval_string = "0"
+			retval_assign = ""
+
+
+		type_size = 0
+		answer_string = "dummy_answer"
+		answer_count = "0"
+		is_array_string = "GL_FALSE"
+
+		for param in f.parameterIterateOutputs():
+			answer_type = param.get_base_type_string()
+			if answer_type == "GLvoid":
+				answer_type = "GLubyte"
+
+
+			c = param.get_element_count()
+			type_size = (param.size() / c)
+			if type_size == 1:
+				size_scale = ""
+			else:
+				size_scale = " * %u" % (type_size)
+
+
+			if param.count_parameter_list:
+				print '        const GLuint compsize = %s;' % (self.size_call(f, 1))
+				print '        %s answerBuffer[200];' %  (answer_type)
+				print '        %s %s = __glXGetAnswerBuffer(cl, compsize%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, size_scale, type_size )
+				answer_string = param.name
+				answer_count = "compsize"
+
+				print ''
+				print '        if (%s == NULL) return BadAlloc;' % (param.name)
+				print '        __glXClearErrorOccured();'
+				print ''
+			elif param.counter:
+				print '        %s answerBuffer[200];' %  (answer_type)
+				print '        %s %s = __glXGetAnswerBuffer(cl, %s%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, param.counter, size_scale, type_size)
+				answer_string = param.name
+				answer_count = param.counter
+			elif c >= 1:
+				print '        %s %s[%u];' % (answer_type, param.name, c)
+				answer_string = param.name
+				answer_count = "%u" % (c)
+
+			if f.reply_always_array:
+				is_array_string = "GL_TRUE"
+
+
+		self.emit_function_call(f, retval_assign, "    ")
+
+
+		if f.needs_reply():
+			if self.do_swap:
+				for param in f.parameterIterateOutputs():
+					c = param.get_element_count()
+					type_size = (param.size() / c)
+
+					if type_size > 1:
+						swap_name = self.swap_name( type_size )
+						print '        (void) %s( (uint%u_t *) %s, %s );' % (swap_name, 8 * type_size, param.name, answer_count)
+
+
+				reply_func = '__glXSendReplySwap'
+			else:
+				reply_func = '__glXSendReply'
+
+			print '        %s(cl->client, %s, %s, %u, %s, %s);' % (reply_func, answer_string, answer_count, type_size, is_array_string, retval_string)
+		#elif f.note_unflushed:
+		#	print '        cx->hasUnflushedCommands = GL_TRUE;'
+
+		print '        error = Success;'
+		print '    }'
+		print ''
+		print '    return error;'
+		return
+
+
+	def printRenderFunction(self, f):
+		# There are 4 distinct phases in a rendering dispatch function.
+		# In the first phase we compute the sizes and offsets of each
+		# element in the command.  In the second phase we (optionally)
+		# re-align 64-bit data elements.  In the third phase we
+		# (optionally) byte-swap array data.  Finally, in the fourth
+		# phase we actually dispatch the function.
+
+		self.common_func_print_just_start(f, "")
+
+		images = f.get_images()
+		if len(images):
+			if self.do_swap:
+				pre = "bswap_CARD32( & "
+				post = " )"
+			else:
+				pre = ""
+				post = ""
+
+			img = images[0]
+
+			# swapBytes and lsbFirst are single byte fields, so
+			# the must NEVER be byte-swapped.
+
+			if not (img.img_type == "GL_BITMAP" and img.img_format == "GL_COLOR_INDEX"):
+				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );'
+
+			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );'
+
+			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) %shdr->rowLength%s) );' % (pre, post)
+			if img.depth:
+				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) %shdr->imageHeight%s) );' % (pre, post)
+			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) %shdr->skipRows%s) );' % (pre, post)
+			if img.depth:
+				print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) %shdr->skipImages%s) );' % (pre, post)
+			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) %shdr->skipPixels%s) );' % (pre, post)
+			print '    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) %shdr->alignment%s) );' % (pre, post)
+			print ''
+
+
+		self.emit_function_call(f, "", "")
+		return
+
+
+if __name__ == '__main__':
+	file_name = "gl_API.xml"
+
+	try:
+		(args, trail) = getopt.getopt(sys.argv[1:], "f:m:s")
+	except Exception,e:
+		show_usage()
+
+	mode = "dispatch_c"
+	do_swap = 0
+	for (arg,val) in args:
+		if arg == "-f":
+			file_name = val
+		elif arg == "-m":
+			mode = val
+		elif arg == "-s":
+			do_swap = 1
+
+	if mode == "dispatch_c":
+		printer = PrintGlxDispatchFunctions(do_swap)
+	elif mode == "dispatch_h":
+		printer = PrintGlxDispatch_h()
+	else:
+		show_usage()
+
+	api = gl_XML.parse_GL_API( file_name, glX_proto_common.glx_proto_item_factory() )
+
+	printer.Print( api )
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index 6330d91f7..bec022218 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -1008,25 +1008,25 @@ class PrintGlxProtoInit_h(gl_XML.gl_print_base):
  * \\author Ian Romanick <idr@us.ibm.com>
  */
 """
-		self.printVisibility( "HIDDEN", "hidden" )
 		self.printFastcall()
 		self.printNoinline()
 
 		print """
+#include <X11/Xfuncproto.h>
 #include "glxclient.h"
 
-extern HIDDEN NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size,
+extern _X_HIDDEN NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size,
     void * dest, GLboolean reply_is_always_array );
 
-extern HIDDEN NOINLINE void __glXReadPixelReply( Display *dpy,
+extern _X_HIDDEN NOINLINE void __glXReadPixelReply( Display *dpy,
     struct glx_context * gc, unsigned max_dim, GLint width, GLint height,
     GLint depth, GLenum format, GLenum type, void * dest,
     GLboolean dimensions_in_reply );
 
-extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest(
+extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest(
     struct glx_context * gc, GLint sop, GLint cmdlen );
 
-extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
+extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
     struct glx_context * gc, GLint code, GLint vop, GLint cmdlen );
 """
 
@@ -1035,13 +1035,13 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
 		for func in api.functionIterateGlx():
 			params = func.get_parameter_string()
 
-			print 'extern HIDDEN %s __indirect_gl%s(%s);' % (func.return_type, func.name, params)
+			print 'extern _X_HIDDEN %s __indirect_gl%s(%s);' % (func.return_type, func.name, params)
 
 			for n in func.entry_points:
 				if func.has_different_protocol(n):
 					asdf = func.static_glx_name(n)
 					if asdf not in func.static_entry_points:
-						print 'extern HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params)
+						print 'extern _X_HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params)
 						# give it a easy-to-remember name
 						if func.client_handcode:
 							print '#define gl_dispatch_stub_%s gl%s' % (n, asdf)
@@ -1052,7 +1052,7 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
 
 		print ''
 		print '#ifdef GLX_SHARED_GLAPI'
-		print 'extern HIDDEN void (*__indirect_get_proc_address(const char *name))(void);'
+		print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);'
 		print '#endif'
 
 
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
index c8c0ad82a..3b182daea 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
@@ -225,7 +225,7 @@ class glx_enum_function:
 
 
 	def Print(self, name):
-		print 'INTERNAL PURE FASTCALL GLint'
+		print '_X_INTERNAL PURE FASTCALL GLint'
 		print '__gl%s_size( GLenum e )' % (name)
 		print '{'
 
@@ -334,20 +334,18 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
 		print ''
 		self.printFastcall()
 		print ''
-		self.printVisibility( "INTERNAL", "internal" )
-		print ''
 		print ''
 		print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)'
 		print '#  undef HAVE_ALIAS'
 		print '#endif'
 		print '#ifdef HAVE_ALIAS'
 		print '#  define ALIAS2(from,to) \\'
-		print '    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\'
+		print '    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\'
 		print '        __attribute__ ((alias( # to )));'
 		print '#  define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )'
 		print '#else'
 		print '#  define ALIAS(from,to) \\'
-		print '    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\'
+		print '    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\'
 		print '    { return __gl ## to ## _size( e ); }'
 		print '#endif'
 		print ''
@@ -387,12 +385,12 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common):
  * \\author Ian Romanick <idr@us.ibm.com>
  */
 """
+		print '#include <X11/Xfuncproto.h>'
+		print ''
 		self.printPure();
 		print ''
 		self.printFastcall();
 		print ''
-		self.printVisibility( "INTERNAL", "internal" );
-		print ''
 
 
 	def printBody(self, api):
@@ -402,7 +400,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common):
 				continue
 
 			if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get):
-				print 'extern INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name)
+				print 'extern _X_INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name)
 
 
 class PrintGlxReqSize_common(gl_XML.gl_print_base):
@@ -426,7 +424,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common):
 
 
 	def printRealHeader(self):
-		self.printVisibility("HIDDEN", "hidden")
+		print '#include <X11/Xfuncproto.h>'
 		print ''
 		self.printPure()
 		print ''
@@ -435,7 +433,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common):
 	def printBody(self, api):
 		for func in api.functionIterateGlx():
 			if not func.ignore and func.has_variable_size_request():
-				print 'extern PURE HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name)
+				print 'extern PURE _X_HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name)
 
 
 class PrintGlxReqSize_c(PrintGlxReqSize_common):
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 28d9fb104..5657e3277 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -33,12 +33,20 @@ import license
 import gl_XML, glX_XML
 import sys, getopt
 
-header = """
+header = """/* GLXEXT is the define used in the xserver when the GLX extension is being
+ * built.  Hijack this to determine whether this file is being built for the
+ * server or the client.
+ */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifdef HAVE_BACKTRACE
+#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE))
+#define USE_BACKTRACE
+#endif
+
+#ifdef USE_BACKTRACE
 #include <execinfo.h>
 #endif
 
@@ -51,15 +59,22 @@ header = """
 #include "glapi.h"
 #include "glapitable.h"
 
+#ifdef GLXEXT
 #include "os.h"
+#endif
 
 static void
 __glapi_gentable_NoOp(void) {
-#if defined(DEBUG) && !defined(_WIN32_WCE)
-    if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
-        const char *fstr = "Unknown";
-
-#ifdef HAVE_BACKTRACE
+    const char *fstr = "Unknown";
+
+    /* Silence potential GCC warning for some #ifdef paths.
+     */
+    (void) fstr;
+#if defined(USE_BACKTRACE)
+#if !defined(GLXEXT)
+    if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
+#endif
+    {
         void *frames[2];
 
         if(backtrace(frames, 2) == 2) {
@@ -68,11 +83,15 @@ __glapi_gentable_NoOp(void) {
             if(info.dli_sname)
                 fstr = info.dli_sname;
         }
-#endif
 
-        LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\\n", fstr);
+#if !defined(GLXEXT)
+        fprintf(stderr, "Call to unimplemented API: %s\\n", fstr);
+#endif
     }
 #endif
+#if defined(GLXEXT)
+    LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\\n", fstr);
+#endif
 }
 
 static void
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index b3dd4d8d0..608ace41a 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -92,6 +92,10 @@ class PrintRemapTable(gl_XML.gl_print_base):
  * can SET_FuncName, are used to get and set the dispatch pointer for the
  * named function in the specified dispatch table.
  */
+/* GLXEXT is defined when building the GLX extension in the xserver.
+ */
+#if !defined(GLXEXT)
+#endif
 """
 		return
 
diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index e6e841d5d..5c0480170 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -27,8 +27,20 @@
  * SOFTWARE.
  */
 
+/* GLXEXT is the define used in the xserver when the GLX extension is being
+ * built.  Hijack this to determine whether this file is being built for the
+ * server or the client.
+ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
 
-#if defined(DEBUG) && !defined(_WIN32_WCE)
+#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \
+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE))
+#define USE_BACKTRACE
+#endif
+
+#ifdef USE_BACKTRACE
 #include <execinfo.h>
 #endif
 
@@ -41,11 +53,22 @@
 #include "glapi.h"
 #include "glapitable.h"
 
+#ifdef GLXEXT
+#include "os.h"
+#endif
+
 static void
 __glapi_gentable_NoOp(void) {
-#if defined(DEBUG) && !defined(_WIN32_WCE)
-    if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
-        const char *fstr = "Unknown";
+    const char *fstr = "Unknown";
+
+    /* Silence potential GCC warning for some #ifdef paths.
+     */
+    (void) fstr;
+#if defined(USE_BACKTRACE)
+#if !defined(GLXEXT)
+    if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
+#endif
+    {
         void *frames[2];
 
         if(backtrace(frames, 2) == 2) {
@@ -55,9 +78,14 @@ __glapi_gentable_NoOp(void) {
                 fstr = info.dli_sname;
         }
 
+#if !defined(GLXEXT)
         fprintf(stderr, "Call to unimplemented API: %s\n", fstr);
+#endif
     }
 #endif
+#if defined(GLXEXT)
+    LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\n", fstr);
+#endif
 }
 
 static void
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index da4d9b185..bd9e94b82 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -58,7 +58,6 @@ main_sources = [
     'main/cpuinfo.c',
     'main/debug.c',
     'main/depth.c',
-    'main/depthstencil.c',
     'main/dlist.c',
     'main/dlopen.c',
     'main/drawpix.c',
@@ -162,6 +161,7 @@ swrast_sources = [
     'swrast/s_copypix.c',
     'swrast/s_context.c',
     'swrast/s_depth.c',
+    'swrast/s_depthstencil.c',
     'swrast/s_drawpix.c',
     'swrast/s_feedback.c',
     'swrast/s_fog.c',
diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index ea8e03286..19eabb85c 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -40,7 +40,11 @@
  * named function in the specified dispatch table.
  */
 
+/* GLXEXT is defined when building the GLX extension in the xserver.
+ */
+#if !defined(GLXEXT)
 #include "main/mfeatures.h"
+#endif
 
 #define CALL_by_offset(disp, cast, offset, parameters) \
     (*(cast (GET_by_offset(disp, offset)))) parameters
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index 366392f0b..b00a738bc 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -1152,7 +1152,6 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_PROGRAM_PARAMETERS_ARB\0"
    "GL_MAX_PROGRAM_TEMPORARIES_ARB\0"
    "GL_MAX_PROGRAM_TEXEL_OFFSET\0"
-   "GL_MAX_PROGRAM_TEXEL_OFFSET_EXT\0"
    "GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB\0"
    "GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB\0"
    "GL_MAX_PROJECTION_STACK_DEPTH\0"
@@ -1216,7 +1215,6 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MINOR_VERSION\0"
    "GL_MIN_EXT\0"
    "GL_MIN_PROGRAM_TEXEL_OFFSET\0"
-   "GL_MIN_PROGRAM_TEXEL_OFFSET_EXT\0"
    "GL_MIRRORED_REPEAT\0"
    "GL_MIRRORED_REPEAT_ARB\0"
    "GL_MIRRORED_REPEAT_IBM\0"
@@ -2381,7 +2379,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2342] =
+static const enum_elt all_enums[2340] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3498,1233 +3496,1231 @@ static const enum_elt all_enums[2342] =
    { 24505, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
    { 24535, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
    { 24566, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-   { 24594, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET_EXT */
-   { 24626, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 24662, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 24698, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 24728, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-   { 24758, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 24792, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 24825, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 24850, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 24879, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
-   { 24908, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 24923, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 24942, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 24969, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 24989, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 25013, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-   { 25040, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
-   { 25071, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 25093, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 25119, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 25146, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25177, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 25201, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 25229, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 25263, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 25283, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 25310, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 25331, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 25356, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 25381, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 25416, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-   { 25465, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 25518, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-   { 25561, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 25608, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-   { 25654, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 25704, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 25730, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 25752, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 25778, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 25801, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 25823, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 25849, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-   { 25881, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 25915, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25953, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 25986, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 26023, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 26053, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 26077, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 26101, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 26138, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 26159, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 26175, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 26189, 0x00008007 }, /* GL_MIN */
-   { 26196, 0x0000802E }, /* GL_MINMAX */
-   { 26206, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 26220, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 26237, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 26258, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 26273, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 26292, 0x0000821C }, /* GL_MINOR_VERSION */
-   { 26309, 0x00008007 }, /* GL_MIN_EXT */
-   { 26320, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-   { 26348, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */
-   { 26380, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 26399, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 26422, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 26445, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 26465, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 26485, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 26515, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 26543, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 26571, 0x00001700 }, /* GL_MODELVIEW */
-   { 26584, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 26602, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 26621, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 26640, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 26659, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 26678, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 26697, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 26716, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 26735, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 26754, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 26773, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 26792, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 26810, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 26829, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 26848, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 26867, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 26886, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 26905, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 26924, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 26943, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 26962, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 26981, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 27000, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 27018, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 27037, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 27056, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 27074, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 27092, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 27110, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 27128, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 27146, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 27164, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 27182, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 27202, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 27244, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 27271, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 27296, 0x00002100 }, /* GL_MODULATE */
-   { 27308, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 27328, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 27355, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 27380, 0x00000103 }, /* GL_MULT */
-   { 27388, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 27403, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 27423, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 27442, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 27461, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 27485, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 27508, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 27538, 0x00002A25 }, /* GL_N3F_V3F */
-   { 27549, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 27569, 0x0000150E }, /* GL_NAND */
-   { 27577, 0x00002600 }, /* GL_NEAREST */
-   { 27588, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 27619, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 27651, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 27676, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 27702, 0x00000200 }, /* GL_NEVER */
-   { 27711, 0x00001102 }, /* GL_NICEST */
-   { 27721, 0x00000000 }, /* GL_NONE */
-   { 27729, 0x00000000 }, /* GL_NONE_OES */
-   { 27741, 0x00001505 }, /* GL_NOOP */
-   { 27749, 0x00001508 }, /* GL_NOR */
-   { 27756, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 27769, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 27785, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 27816, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 27851, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 27875, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 27898, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 27919, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 27933, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 27951, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 27968, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 27986, 0x00000205 }, /* GL_NOTEQUAL */
-   { 27998, 0x00000000 }, /* GL_NO_ERROR */
-   { 28010, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
-   { 28039, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 28073, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 28111, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 28129, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-   { 28159, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 28193, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 28222, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 28254, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 28296, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 28326, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 28366, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 28397, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 28426, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 28454, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 28484, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 28501, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 28527, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 28543, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 28578, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 28600, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 28615, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 28634, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 28664, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 28685, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 28713, 0x00000001 }, /* GL_ONE */
-   { 28720, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 28748, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 28780, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 28808, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 28840, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 28863, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 28886, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 28909, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 28932, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 28950, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 28972, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 28994, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 29010, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 29030, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 29050, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 29068, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 29090, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 29112, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 29128, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 29148, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 29168, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 29186, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 29208, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 29230, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 29246, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 29266, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 29286, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 29307, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 29326, 0x00001507 }, /* GL_OR */
-   { 29332, 0x00000A01 }, /* GL_ORDER */
-   { 29341, 0x0000150D }, /* GL_OR_INVERTED */
-   { 29356, 0x0000150B }, /* GL_OR_REVERSE */
-   { 29370, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 29387, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 29405, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 29426, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 29446, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 29464, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 29483, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 29503, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 29523, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 29541, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 29560, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 29585, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 29609, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 29630, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 29652, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 29674, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 29699, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 29723, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 29744, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 29766, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 29788, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 29810, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 29841, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 29861, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 29886, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 29906, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 29931, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 29951, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 29976, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 29996, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 30021, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 30041, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 30066, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 30086, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 30111, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 30131, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 30156, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 30176, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 30201, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 30221, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 30246, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 30266, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 30291, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 30309, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 30330, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 30359, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 30392, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 30417, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 30440, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 30471, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 30506, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 30533, 0x00001B00 }, /* GL_POINT */
-   { 30542, 0x00000000 }, /* GL_POINTS */
-   { 30552, 0x00000002 }, /* GL_POINT_BIT */
-   { 30565, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 30595, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 30629, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 30663, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 30698, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 30727, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 30760, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 30793, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 30827, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 30841, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 30880, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 30904, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 30936, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 30967, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 30996, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 31022, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 31040, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 31062, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 31084, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 31107, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 31125, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 31147, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 31169, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 31192, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 31212, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 31228, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 31249, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 31265, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 31285, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 31314, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 31333, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 31353, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 31379, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 31394, 0x00000009 }, /* GL_POLYGON */
-   { 31405, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 31420, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 31436, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 31459, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 31484, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 31507, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 31530, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 31554, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 31578, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 31596, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 31619, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 31638, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 31661, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 31678, 0x00001203 }, /* GL_POSITION */
-   { 31690, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 31722, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 31758, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 31791, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 31828, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 31859, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 31894, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 31926, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 31962, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31995, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 32027, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 32063, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 32096, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 32133, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 32163, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 32197, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 32228, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 32263, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 32294, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 32329, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 32361, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 32397, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 32427, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 32461, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 32492, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 32527, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 32559, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 32590, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 32625, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 32657, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 32693, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 32722, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 32755, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 32785, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 32819, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 32858, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 32891, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 32931, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 32965, 0x00008578 }, /* GL_PREVIOUS */
-   { 32977, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 32993, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 33009, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 33026, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 33047, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 33068, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 33092, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 33120, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 33141, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 33168, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 33198, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 33222, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 33255, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 33287, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 33310, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
-   { 33336, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 33366, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
-   { 33391, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 33420, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-   { 33455, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 33478, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 33508, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 33537, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 33565, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 33587, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 33615, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 33643, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 33665, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 33686, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 33726, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 33765, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 33795, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 33830, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 33863, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 33897, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 33936, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 33975, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 33997, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 34023, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 34047, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 34069, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 34095, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 34118, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 34140, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 34161, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 34182, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 34209, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 34241, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 34273, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 34308, 0x00001701 }, /* GL_PROJECTION */
-   { 34322, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 34343, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 34386, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 34412, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 34432, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 34456, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 34477, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 34496, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 34519, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 34558, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 34596, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 34616, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 34642, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 34672, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 34696, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 34716, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 34742, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 34772, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 34796, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 34816, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 34849, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 34875, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 34905, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 34932, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 34963, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 34993, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 35012, 0x00002003 }, /* GL_Q */
-   { 35017, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 35042, 0x00000007 }, /* GL_QUADS */
-   { 35051, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 35095, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 35143, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 35160, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 35174, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 35201, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 35231, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 35255, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 35282, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 35304, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 35330, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 35347, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 35367, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 35383, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 35403, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 35429, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 35459, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 35473, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 35490, 0x00002002 }, /* GL_R */
-   { 35495, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 35513, 0x00008F98 }, /* GL_R16_SNORM */
-   { 35526, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 35538, 0x00008F94 }, /* GL_R8_SNORM */
-   { 35550, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 35572, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 35598, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 35631, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 35646, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 35666, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 35694, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 35726, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 35750, 0x000088B8 }, /* GL_READ_ONLY */
-   { 35763, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 35780, 0x000088BA }, /* GL_READ_WRITE */
-   { 35794, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 35812, 0x00001903 }, /* GL_RED */
-   { 35819, 0x00008016 }, /* GL_REDUCE */
-   { 35829, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 35843, 0x00000D15 }, /* GL_RED_BIAS */
-   { 35855, 0x00000D52 }, /* GL_RED_BITS */
-   { 35867, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 35882, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 35901, 0x00000D14 }, /* GL_RED_SCALE */
-   { 35914, 0x00008F90 }, /* GL_RED_SNORM */
-   { 35927, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 35945, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 35967, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 35988, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 36010, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 36028, 0x00001C00 }, /* GL_RENDER */
-   { 36038, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 36054, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 36081, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 36112, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 36136, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 36164, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 36192, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 36218, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 36248, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 36275, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 36306, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 36326, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 36353, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 36384, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 36407, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 36434, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 36461, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 36493, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 36529, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 36565, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 36585, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 36610, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 36639, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 36663, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 36691, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 36720, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 36753, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 36775, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 36801, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 36827, 0x00001F01 }, /* GL_RENDERER */
-   { 36839, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 36854, 0x00002901 }, /* GL_REPEAT */
-   { 36864, 0x00001E01 }, /* GL_REPLACE */
-   { 36875, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 36890, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 36913, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-   { 36949, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 36967, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 36989, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-   { 37024, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 37042, 0x00000102 }, /* GL_RETURN */
-   { 37052, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 37066, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 37079, 0x00001907 }, /* GL_RGB */
-   { 37086, 0x00008052 }, /* GL_RGB10 */
-   { 37095, 0x00008059 }, /* GL_RGB10_A2 */
-   { 37107, 0x0000906F }, /* GL_RGB10_A2UI */
-   { 37121, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 37137, 0x00008052 }, /* GL_RGB10_EXT */
-   { 37150, 0x00008053 }, /* GL_RGB12 */
-   { 37159, 0x00008053 }, /* GL_RGB12_EXT */
-   { 37172, 0x00008054 }, /* GL_RGB16 */
-   { 37181, 0x0000881B }, /* GL_RGB16F */
-   { 37191, 0x00008D89 }, /* GL_RGB16I */
-   { 37201, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 37215, 0x00008D77 }, /* GL_RGB16UI */
-   { 37226, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 37241, 0x00008054 }, /* GL_RGB16_EXT */
-   { 37254, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 37269, 0x0000804E }, /* GL_RGB2_EXT */
-   { 37281, 0x00008815 }, /* GL_RGB32F */
-   { 37291, 0x00008D83 }, /* GL_RGB32I */
-   { 37301, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 37315, 0x00008D71 }, /* GL_RGB32UI */
-   { 37326, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 37341, 0x0000804F }, /* GL_RGB4 */
-   { 37349, 0x0000804F }, /* GL_RGB4_EXT */
-   { 37361, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 37374, 0x00008050 }, /* GL_RGB5 */
-   { 37382, 0x00008D62 }, /* GL_RGB565 */
-   { 37392, 0x00008D62 }, /* GL_RGB565_OES */
-   { 37406, 0x00008057 }, /* GL_RGB5_A1 */
-   { 37417, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 37432, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 37447, 0x00008050 }, /* GL_RGB5_EXT */
-   { 37459, 0x00008051 }, /* GL_RGB8 */
-   { 37467, 0x00008D8F }, /* GL_RGB8I */
-   { 37476, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 37489, 0x00008D7D }, /* GL_RGB8UI */
-   { 37499, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 37513, 0x00008051 }, /* GL_RGB8_EXT */
-   { 37525, 0x00008051 }, /* GL_RGB8_OES */
-   { 37537, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 37551, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 37562, 0x00001908 }, /* GL_RGBA */
-   { 37570, 0x0000805A }, /* GL_RGBA12 */
-   { 37580, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 37594, 0x0000805B }, /* GL_RGBA16 */
-   { 37604, 0x0000881A }, /* GL_RGBA16F */
-   { 37615, 0x00008D88 }, /* GL_RGBA16I */
-   { 37626, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 37641, 0x00008D76 }, /* GL_RGBA16UI */
-   { 37653, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 37669, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 37683, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 37699, 0x00008055 }, /* GL_RGBA2 */
-   { 37708, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 37721, 0x00008814 }, /* GL_RGBA32F */
-   { 37732, 0x00008D82 }, /* GL_RGBA32I */
-   { 37743, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 37758, 0x00008D70 }, /* GL_RGBA32UI */
-   { 37770, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 37786, 0x00008056 }, /* GL_RGBA4 */
-   { 37795, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 37814, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 37827, 0x00008056 }, /* GL_RGBA4_OES */
-   { 37840, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 37854, 0x00008058 }, /* GL_RGBA8 */
-   { 37863, 0x00008D8E }, /* GL_RGBA8I */
-   { 37873, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 37887, 0x00008D7C }, /* GL_RGBA8UI */
-   { 37898, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 37913, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 37926, 0x00008058 }, /* GL_RGBA8_OES */
-   { 37939, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 37954, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 37972, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 37995, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 38011, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 38031, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 38056, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 38069, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 38082, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 38096, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 38111, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 38130, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 38142, 0x00008573 }, /* GL_RGB_SCALE */
-   { 38155, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 38172, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 38189, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 38202, 0x00008F91 }, /* GL_RG_SNORM */
-   { 38214, 0x00000407 }, /* GL_RIGHT */
-   { 38223, 0x00002000 }, /* GL_S */
-   { 38228, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 38242, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 38262, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 38286, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 38313, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 38344, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 38365, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 38379, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 38399, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 38423, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 38450, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 38481, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 38500, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 38526, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 38547, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 38561, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 38579, 0x00008919 }, /* GL_SAMPLER_BINDING */
-   { 38598, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 38616, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 38638, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 38654, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 38677, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 38704, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
-   { 38728, 0x000080A9 }, /* GL_SAMPLES */
-   { 38739, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 38755, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 38770, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 38788, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 38810, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38838, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38870, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38893, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38920, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38938, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38961, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38983, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 39002, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 39025, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 39051, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 39081, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 39106, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 39135, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 39150, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 39165, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 39181, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 39206, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 39246, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 39290, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 39323, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 39353, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 39385, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 39415, 0x00001C02 }, /* GL_SELECT */
-   { 39425, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 39453, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 39478, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 39494, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 39514, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 39538, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 39565, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 39596, 0x0000150F }, /* GL_SET */
-   { 39603, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 39628, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 39647, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 39668, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 39692, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 39707, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 39722, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 39750, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 39773, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 39803, 0x00001601 }, /* GL_SHININESS */
-   { 39816, 0x00001402 }, /* GL_SHORT */
-   { 39825, 0x00009119 }, /* GL_SIGNALED */
-   { 39837, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39858, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39874, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39894, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39913, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39927, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39942, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39964, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39984, 0x00001D01 }, /* GL_SMOOTH */
-   { 39994, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 40027, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 40054, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 40087, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 40114, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 40131, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 40152, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 40173, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 40188, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 40207, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 40226, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 40243, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 40264, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 40285, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 40300, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 40319, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 40338, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 40355, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 40376, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 40397, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 40412, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 40431, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 40450, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 40470, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 40488, 0x00001202 }, /* GL_SPECULAR */
-   { 40500, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 40514, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 40529, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 40547, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 40564, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 40578, 0x00008580 }, /* GL_SRC0_RGB */
-   { 40590, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 40604, 0x00008581 }, /* GL_SRC1_RGB */
-   { 40616, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 40630, 0x00008582 }, /* GL_SRC2_RGB */
-   { 40642, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 40655, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 40677, 0x00000300 }, /* GL_SRC_COLOR */
-   { 40690, 0x00008C40 }, /* GL_SRGB */
-   { 40698, 0x00008C41 }, /* GL_SRGB8 */
-   { 40707, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 40723, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 40737, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 40755, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 40774, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 40789, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 40808, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 40823, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40842, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40857, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40876, 0x00001802 }, /* GL_STENCIL */
-   { 40887, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40909, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40935, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40961, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40982, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 41007, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 41028, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 41053, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 41085, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 41121, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 41153, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 41189, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 41209, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 41236, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 41262, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 41278, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 41296, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 41318, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 41341, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 41357, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 41373, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 41390, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 41408, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 41427, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 41450, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 41472, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 41494, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 41512, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 41534, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 41556, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 41574, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 41596, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 41618, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 41639, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 41666, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 41693, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 41708, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 41724, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 41753, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 41775, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 41796, 0x00000C33 }, /* GL_STEREO */
-   { 41806, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 41830, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41855, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41879, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41894, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41913, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41928, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41947, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41962, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41981, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41998, 0x000084E7 }, /* GL_SUBTRACT */
-   { 42010, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 42026, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 42044, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 42058, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 42072, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 42099, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 42129, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 42144, 0x00002001 }, /* GL_T */
-   { 42149, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 42164, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 42183, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 42199, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 42214, 0x00002A27 }, /* GL_T2F_V3F */
-   { 42225, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 42244, 0x00002A28 }, /* GL_T4F_V4F */
-   { 42255, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 42278, 0x00001702 }, /* GL_TEXTURE */
-   { 42289, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 42301, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 42317, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 42329, 0x000084CA }, /* GL_TEXTURE10 */
-   { 42342, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 42359, 0x000084CB }, /* GL_TEXTURE11 */
-   { 42372, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 42389, 0x000084CC }, /* GL_TEXTURE12 */
-   { 42402, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 42419, 0x000084CD }, /* GL_TEXTURE13 */
-   { 42432, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 42449, 0x000084CE }, /* GL_TEXTURE14 */
-   { 42462, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 42479, 0x000084CF }, /* GL_TEXTURE15 */
-   { 42492, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 42509, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 42522, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 42539, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 42552, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 42569, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 42582, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 42599, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 42612, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 42629, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 42645, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 42657, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 42670, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 42687, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 42700, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 42717, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 42730, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 42747, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 42760, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 42777, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 42790, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 42807, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 42820, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42837, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42850, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42867, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42880, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42897, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42910, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42927, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42940, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42957, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42973, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42985, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42998, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 43015, 0x000084DF }, /* GL_TEXTURE31 */
-   { 43028, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 43045, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 43061, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 43073, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 43089, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 43101, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 43117, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 43129, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 43145, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 43157, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 43173, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 43185, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 43201, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 43213, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 43229, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 43243, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 43263, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 43287, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 43301, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 43321, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 43345, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 43359, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 43377, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 43399, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 43425, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 43447, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 43469, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 43497, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 43529, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 43551, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 43579, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 43611, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 43633, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 43659, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 43685, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 43715, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 43743, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 43775, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 43807, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-   { 43839, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 43868, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43901, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43933, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43948, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43969, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43994, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 44012, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 44036, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 44054, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 44076, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 44113, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 44154, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 44179, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 44208, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 44239, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 44269, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 44299, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 44334, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 44365, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 44403, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 44430, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 44462, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 44496, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 44520, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 44548, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 44572, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 44600, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 44633, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 44657, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 44679, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 44701, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 44727, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 44761, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 44794, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 44831, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 44859, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 44891, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 44914, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 44952, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44994, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 45025, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 45053, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 45083, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 45111, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 45136, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 45156, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 45180, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 45211, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 45246, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 45281, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 45312, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 45347, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 45382, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 45413, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 45448, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 45483, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 45507, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 45538, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 45573, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 45608, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 45639, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 45674, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 45709, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 45740, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 45775, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 45810, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 45839, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 45856, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 45878, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 45904, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 45919, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 45940, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 45960, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
-   { 45984, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 46010, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 46040, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 46060, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 46084, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 46101, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 46118, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 46135, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 46158, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 46175, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 46200, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 46222, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 46248, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 46266, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 46292, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 46318, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 46348, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 46375, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 46400, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 46420, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 46444, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 46471, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 46498, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 46525, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 46551, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 46581, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 46603, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 46621, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 46661, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 46691, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 46719, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 46747, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 46775, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 46796, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 46815, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 46837, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 46856, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 46876, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 46906, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 46937, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 46958, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 46983, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 47007, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 47027, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 47051, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 47071, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 47094, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 47117, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 47141, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 47169, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 47199, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 47224, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 47258, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 47275, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 47293, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 47315, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 47333, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 47351, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 47370, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 47390, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 47409, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 47438, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 47455, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 47477, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 47507, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 47536, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 47572, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 47609, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 47650, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 47683, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 47717, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 47755, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 47791, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 47825, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 47863, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 47898, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 47937, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 47978, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 48023, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 48054, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 48089, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 48130, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 48175, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 48201, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 48231, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 48263, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 48293, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 48327, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 48343, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 48374, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 48409, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 48437, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 48469, 0x00000004 }, /* GL_TRIANGLES */
-   { 48482, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 48505, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 48532, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 48548, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 48569, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 48587, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 48615, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 48647, 0x00000001 }, /* GL_TRUE */
-   { 48655, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 48674, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-   { 48703, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 48723, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 48746, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 48766, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 48787, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 48809, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 48831, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 48851, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 48872, 0x00009118 }, /* GL_UNSIGNALED */
-   { 48886, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 48903, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 48930, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 48953, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 48969, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 49001, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 49028, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 49059, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 49080, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 49105, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 49129, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 49154, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 49185, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 49220, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 49248, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 49272, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 49300, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 49327, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 49360, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 49397, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 49428, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 49455, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 49488, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 49525, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 49556, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 49588, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 49624, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 49651, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 49682, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 49713, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 49748, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 49777, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 49810, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 49831, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 49856, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 49877, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 49902, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 49923, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 49948, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 49971, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 49989, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 50019, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 50053, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 50079, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 50109, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 50143, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 50169, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 50193, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 50221, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 50249, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 50276, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 50308, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 50339, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 50353, 0x00002A20 }, /* GL_V2F */
-   { 50360, 0x00002A21 }, /* GL_V3F */
-   { 50367, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 50386, 0x00001F00 }, /* GL_VENDOR */
-   { 50396, 0x00001F02 }, /* GL_VERSION */
-   { 50407, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 50423, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 50447, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 50477, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 50508, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 50543, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 50567, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 50588, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 50611, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 50632, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 50659, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 50687, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 50715, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 50743, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 50771, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 50799, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 50827, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 50854, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 50881, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 50908, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 50935, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 50962, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 50989, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 51016, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 51043, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 51070, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 51108, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 51150, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 51185, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 51216, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 51251, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 51282, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 51317, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 51351, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 51389, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 51420, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 51455, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 51483, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 51515, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 51545, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 51579, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 51607, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 51639, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 51659, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 51681, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 51710, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 51731, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 51760, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 51793, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 51825, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 51852, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 51883, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 51913, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 51930, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 51951, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 51978, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 51990, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 52006, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 52024, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 52039, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 52059, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 52090, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 52125, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 52160, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 52180, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 52208, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 52236, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 52261, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 52286, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 52313, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 52340, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 52365, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 52390, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 52414, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 52433, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 52447, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 52465, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 52483, 0x00001506 }, /* GL_XOR */
-   { 52490, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 52509, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 52523, 0x00000000 }, /* GL_ZERO */
-   { 52531, 0x00000D16 }, /* GL_ZOOM_X */
-   { 52541, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 24594, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 24630, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 24666, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 24696, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+   { 24726, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 24760, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 24793, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 24818, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 24847, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
+   { 24876, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 24891, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 24910, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 24937, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 24957, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 24981, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+   { 25008, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
+   { 25039, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 25061, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 25087, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 25114, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25145, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 25169, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 25197, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 25231, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 25251, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 25278, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 25299, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 25324, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 25349, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 25384, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+   { 25433, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 25486, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+   { 25529, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 25576, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+   { 25622, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 25672, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 25698, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 25720, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 25746, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 25769, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 25791, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 25817, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+   { 25849, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 25883, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25921, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 25954, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 25991, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 26021, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 26045, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 26069, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 26106, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 26127, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 26143, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 26157, 0x00008007 }, /* GL_MIN */
+   { 26164, 0x0000802E }, /* GL_MINMAX */
+   { 26174, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 26188, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 26205, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 26226, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 26241, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 26260, 0x0000821C }, /* GL_MINOR_VERSION */
+   { 26277, 0x00008007 }, /* GL_MIN_EXT */
+   { 26288, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+   { 26316, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 26335, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 26358, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 26381, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 26401, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 26421, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 26451, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 26479, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 26507, 0x00001700 }, /* GL_MODELVIEW */
+   { 26520, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 26538, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 26557, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 26576, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 26595, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 26614, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 26633, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 26652, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 26671, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 26690, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 26709, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 26728, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 26746, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 26765, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 26784, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 26803, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 26822, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 26841, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 26860, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 26879, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 26898, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 26917, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 26936, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 26954, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 26973, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 26992, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 27010, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 27028, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 27046, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 27064, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 27082, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 27100, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 27118, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 27138, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 27180, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 27207, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 27232, 0x00002100 }, /* GL_MODULATE */
+   { 27244, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 27264, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 27291, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 27316, 0x00000103 }, /* GL_MULT */
+   { 27324, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 27339, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 27359, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 27378, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 27397, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 27421, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 27444, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 27474, 0x00002A25 }, /* GL_N3F_V3F */
+   { 27485, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 27505, 0x0000150E }, /* GL_NAND */
+   { 27513, 0x00002600 }, /* GL_NEAREST */
+   { 27524, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 27555, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 27587, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 27612, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 27638, 0x00000200 }, /* GL_NEVER */
+   { 27647, 0x00001102 }, /* GL_NICEST */
+   { 27657, 0x00000000 }, /* GL_NONE */
+   { 27665, 0x00000000 }, /* GL_NONE_OES */
+   { 27677, 0x00001505 }, /* GL_NOOP */
+   { 27685, 0x00001508 }, /* GL_NOR */
+   { 27692, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 27705, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 27721, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 27752, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 27787, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 27811, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 27834, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 27855, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 27869, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 27887, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 27904, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 27922, 0x00000205 }, /* GL_NOTEQUAL */
+   { 27934, 0x00000000 }, /* GL_NO_ERROR */
+   { 27946, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
+   { 27975, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 28009, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 28047, 0x0000821D }, /* GL_NUM_EXTENSIONS */
+   { 28065, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+   { 28095, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 28129, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 28158, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 28190, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 28232, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 28262, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 28302, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 28333, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 28362, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 28390, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 28420, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 28437, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 28463, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 28479, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 28514, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 28536, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 28551, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 28570, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 28600, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 28621, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 28649, 0x00000001 }, /* GL_ONE */
+   { 28656, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 28684, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 28716, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 28744, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 28776, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 28799, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 28822, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 28845, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 28868, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 28886, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 28908, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 28930, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 28946, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 28966, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 28986, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 29004, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 29026, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 29048, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 29064, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 29084, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 29104, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 29122, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 29144, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 29166, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 29182, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 29202, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 29222, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 29243, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 29262, 0x00001507 }, /* GL_OR */
+   { 29268, 0x00000A01 }, /* GL_ORDER */
+   { 29277, 0x0000150D }, /* GL_OR_INVERTED */
+   { 29292, 0x0000150B }, /* GL_OR_REVERSE */
+   { 29306, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 29323, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 29341, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 29362, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 29382, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 29400, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 29419, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 29439, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 29459, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 29477, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 29496, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 29521, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 29545, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 29566, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 29588, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 29610, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 29635, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 29659, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 29680, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 29702, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 29724, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 29746, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 29777, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 29797, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 29822, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 29842, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 29867, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 29887, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 29912, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 29932, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 29957, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 29977, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 30002, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 30022, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 30047, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 30067, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 30092, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 30112, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 30137, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 30157, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 30182, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 30202, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 30227, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 30245, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 30266, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 30295, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 30328, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 30353, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 30376, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 30407, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 30442, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 30469, 0x00001B00 }, /* GL_POINT */
+   { 30478, 0x00000000 }, /* GL_POINTS */
+   { 30488, 0x00000002 }, /* GL_POINT_BIT */
+   { 30501, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 30531, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 30565, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 30599, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 30634, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 30663, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 30696, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 30729, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 30763, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 30777, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 30816, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 30840, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 30872, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 30903, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 30932, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 30958, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 30976, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 30998, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 31020, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 31043, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 31061, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 31083, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 31105, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 31128, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 31148, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 31164, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 31185, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 31201, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 31221, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 31250, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 31269, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 31289, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 31315, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 31330, 0x00000009 }, /* GL_POLYGON */
+   { 31341, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 31356, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 31372, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 31395, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 31420, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 31443, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 31466, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 31490, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 31514, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 31532, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 31555, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 31574, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 31597, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 31614, 0x00001203 }, /* GL_POSITION */
+   { 31626, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 31658, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 31694, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 31727, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 31764, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 31795, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 31830, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 31862, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 31898, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31931, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 31963, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 31999, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 32032, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 32069, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 32099, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 32133, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 32164, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 32199, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 32230, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 32265, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 32297, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 32333, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 32363, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 32397, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 32428, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 32463, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 32495, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 32526, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 32561, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 32593, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 32629, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 32658, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 32691, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 32721, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 32755, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 32794, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 32827, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 32867, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 32901, 0x00008578 }, /* GL_PREVIOUS */
+   { 32913, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 32929, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 32945, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 32962, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 32983, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 33004, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 33028, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 33056, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 33077, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 33104, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 33134, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 33158, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 33191, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 33223, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 33246, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
+   { 33272, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 33302, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
+   { 33327, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 33356, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+   { 33391, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 33414, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 33444, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 33473, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 33501, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 33523, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 33551, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 33579, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 33601, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 33622, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 33662, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 33701, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 33731, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 33766, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 33799, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 33833, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 33872, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 33911, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 33933, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 33959, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 33983, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 34005, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 34031, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 34054, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 34076, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 34097, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 34118, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 34145, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 34177, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 34209, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 34244, 0x00001701 }, /* GL_PROJECTION */
+   { 34258, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 34279, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 34322, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 34348, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 34368, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 34392, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 34413, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 34432, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 34455, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 34494, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 34532, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 34552, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 34578, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 34608, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 34632, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 34652, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 34678, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 34708, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 34732, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 34752, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 34785, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 34811, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 34841, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 34868, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 34899, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 34929, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 34948, 0x00002003 }, /* GL_Q */
+   { 34953, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 34978, 0x00000007 }, /* GL_QUADS */
+   { 34987, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 35031, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 35079, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 35096, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 35110, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 35137, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 35167, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 35191, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 35218, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 35240, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 35266, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 35283, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 35303, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 35319, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 35339, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 35365, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 35395, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 35409, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 35426, 0x00002002 }, /* GL_R */
+   { 35431, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 35449, 0x00008F98 }, /* GL_R16_SNORM */
+   { 35462, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 35474, 0x00008F94 }, /* GL_R8_SNORM */
+   { 35486, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 35508, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 35534, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 35567, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 35582, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 35602, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 35630, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 35662, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 35686, 0x000088B8 }, /* GL_READ_ONLY */
+   { 35699, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 35716, 0x000088BA }, /* GL_READ_WRITE */
+   { 35730, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 35748, 0x00001903 }, /* GL_RED */
+   { 35755, 0x00008016 }, /* GL_REDUCE */
+   { 35765, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 35779, 0x00000D15 }, /* GL_RED_BIAS */
+   { 35791, 0x00000D52 }, /* GL_RED_BITS */
+   { 35803, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 35818, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 35837, 0x00000D14 }, /* GL_RED_SCALE */
+   { 35850, 0x00008F90 }, /* GL_RED_SNORM */
+   { 35863, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 35881, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 35903, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 35924, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 35946, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 35964, 0x00001C00 }, /* GL_RENDER */
+   { 35974, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 35990, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 36017, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 36048, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 36072, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 36100, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 36128, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 36154, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 36184, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 36211, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 36242, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 36262, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 36289, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 36320, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 36343, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 36370, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 36397, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 36429, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 36465, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 36501, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 36521, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 36546, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 36575, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 36599, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 36627, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 36656, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 36689, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 36711, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 36737, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 36763, 0x00001F01 }, /* GL_RENDERER */
+   { 36775, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 36790, 0x00002901 }, /* GL_REPEAT */
+   { 36800, 0x00001E01 }, /* GL_REPLACE */
+   { 36811, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 36826, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 36849, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+   { 36885, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 36903, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 36925, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+   { 36960, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 36978, 0x00000102 }, /* GL_RETURN */
+   { 36988, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 37002, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 37015, 0x00001907 }, /* GL_RGB */
+   { 37022, 0x00008052 }, /* GL_RGB10 */
+   { 37031, 0x00008059 }, /* GL_RGB10_A2 */
+   { 37043, 0x0000906F }, /* GL_RGB10_A2UI */
+   { 37057, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 37073, 0x00008052 }, /* GL_RGB10_EXT */
+   { 37086, 0x00008053 }, /* GL_RGB12 */
+   { 37095, 0x00008053 }, /* GL_RGB12_EXT */
+   { 37108, 0x00008054 }, /* GL_RGB16 */
+   { 37117, 0x0000881B }, /* GL_RGB16F */
+   { 37127, 0x00008D89 }, /* GL_RGB16I */
+   { 37137, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 37151, 0x00008D77 }, /* GL_RGB16UI */
+   { 37162, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 37177, 0x00008054 }, /* GL_RGB16_EXT */
+   { 37190, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 37205, 0x0000804E }, /* GL_RGB2_EXT */
+   { 37217, 0x00008815 }, /* GL_RGB32F */
+   { 37227, 0x00008D83 }, /* GL_RGB32I */
+   { 37237, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 37251, 0x00008D71 }, /* GL_RGB32UI */
+   { 37262, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 37277, 0x0000804F }, /* GL_RGB4 */
+   { 37285, 0x0000804F }, /* GL_RGB4_EXT */
+   { 37297, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 37310, 0x00008050 }, /* GL_RGB5 */
+   { 37318, 0x00008D62 }, /* GL_RGB565 */
+   { 37328, 0x00008D62 }, /* GL_RGB565_OES */
+   { 37342, 0x00008057 }, /* GL_RGB5_A1 */
+   { 37353, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 37368, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 37383, 0x00008050 }, /* GL_RGB5_EXT */
+   { 37395, 0x00008051 }, /* GL_RGB8 */
+   { 37403, 0x00008D8F }, /* GL_RGB8I */
+   { 37412, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 37425, 0x00008D7D }, /* GL_RGB8UI */
+   { 37435, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 37449, 0x00008051 }, /* GL_RGB8_EXT */
+   { 37461, 0x00008051 }, /* GL_RGB8_OES */
+   { 37473, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 37487, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 37498, 0x00001908 }, /* GL_RGBA */
+   { 37506, 0x0000805A }, /* GL_RGBA12 */
+   { 37516, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 37530, 0x0000805B }, /* GL_RGBA16 */
+   { 37540, 0x0000881A }, /* GL_RGBA16F */
+   { 37551, 0x00008D88 }, /* GL_RGBA16I */
+   { 37562, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 37577, 0x00008D76 }, /* GL_RGBA16UI */
+   { 37589, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 37605, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 37619, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 37635, 0x00008055 }, /* GL_RGBA2 */
+   { 37644, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 37657, 0x00008814 }, /* GL_RGBA32F */
+   { 37668, 0x00008D82 }, /* GL_RGBA32I */
+   { 37679, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 37694, 0x00008D70 }, /* GL_RGBA32UI */
+   { 37706, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 37722, 0x00008056 }, /* GL_RGBA4 */
+   { 37731, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 37750, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 37763, 0x00008056 }, /* GL_RGBA4_OES */
+   { 37776, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 37790, 0x00008058 }, /* GL_RGBA8 */
+   { 37799, 0x00008D8E }, /* GL_RGBA8I */
+   { 37809, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 37823, 0x00008D7C }, /* GL_RGBA8UI */
+   { 37834, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 37849, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 37862, 0x00008058 }, /* GL_RGBA8_OES */
+   { 37875, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 37890, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 37908, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 37931, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 37947, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 37967, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 37992, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 38005, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 38018, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 38032, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 38047, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 38066, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 38078, 0x00008573 }, /* GL_RGB_SCALE */
+   { 38091, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 38108, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 38125, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 38138, 0x00008F91 }, /* GL_RG_SNORM */
+   { 38150, 0x00000407 }, /* GL_RIGHT */
+   { 38159, 0x00002000 }, /* GL_S */
+   { 38164, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 38178, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 38198, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 38222, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 38249, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 38280, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 38301, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 38315, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 38335, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 38359, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 38386, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 38417, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 38436, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 38462, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 38483, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 38497, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 38515, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 38534, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 38552, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 38574, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 38590, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 38613, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 38640, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
+   { 38664, 0x000080A9 }, /* GL_SAMPLES */
+   { 38675, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 38691, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 38706, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 38724, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 38746, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 38774, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 38806, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 38829, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 38856, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 38874, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 38897, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 38919, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 38938, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 38961, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 38987, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 39017, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 39042, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 39071, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 39086, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 39101, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 39117, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 39142, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 39182, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 39226, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 39259, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 39289, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 39321, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 39351, 0x00001C02 }, /* GL_SELECT */
+   { 39361, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 39389, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 39414, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 39430, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 39450, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 39474, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 39501, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 39532, 0x0000150F }, /* GL_SET */
+   { 39539, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 39564, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 39583, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 39604, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 39628, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 39643, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 39658, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 39686, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 39709, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 39739, 0x00001601 }, /* GL_SHININESS */
+   { 39752, 0x00001402 }, /* GL_SHORT */
+   { 39761, 0x00009119 }, /* GL_SIGNALED */
+   { 39773, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 39794, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 39810, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 39830, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 39849, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 39863, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 39878, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 39900, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 39920, 0x00001D01 }, /* GL_SMOOTH */
+   { 39930, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 39963, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 39990, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 40023, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 40050, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 40067, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 40088, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 40109, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 40124, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 40143, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 40162, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 40179, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 40200, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 40221, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 40236, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 40255, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 40274, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 40291, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 40312, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 40333, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 40348, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 40367, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 40386, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 40406, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 40424, 0x00001202 }, /* GL_SPECULAR */
+   { 40436, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 40450, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 40465, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 40483, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 40500, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 40514, 0x00008580 }, /* GL_SRC0_RGB */
+   { 40526, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 40540, 0x00008581 }, /* GL_SRC1_RGB */
+   { 40552, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 40566, 0x00008582 }, /* GL_SRC2_RGB */
+   { 40578, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 40591, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 40613, 0x00000300 }, /* GL_SRC_COLOR */
+   { 40626, 0x00008C40 }, /* GL_SRGB */
+   { 40634, 0x00008C41 }, /* GL_SRGB8 */
+   { 40643, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 40659, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 40673, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 40691, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 40710, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 40725, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 40744, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 40759, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 40778, 0x000088E5 }, /* GL_STATIC_READ */
+   { 40793, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 40812, 0x00001802 }, /* GL_STENCIL */
+   { 40823, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 40845, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 40871, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 40897, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 40918, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 40943, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 40964, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 40989, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 41021, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 41057, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 41089, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 41125, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 41145, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 41172, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 41198, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 41214, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 41232, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 41254, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 41277, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 41293, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 41309, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 41326, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 41344, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 41363, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 41386, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 41408, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 41430, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 41448, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 41470, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 41492, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 41510, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 41532, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 41554, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 41575, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 41602, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 41629, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 41644, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 41660, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 41689, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 41711, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 41732, 0x00000C33 }, /* GL_STEREO */
+   { 41742, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 41766, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 41791, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 41815, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 41830, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 41849, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 41864, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 41883, 0x000088E1 }, /* GL_STREAM_READ */
+   { 41898, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 41917, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 41934, 0x000084E7 }, /* GL_SUBTRACT */
+   { 41946, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 41962, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 41980, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 41994, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 42008, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 42035, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 42065, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 42080, 0x00002001 }, /* GL_T */
+   { 42085, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 42100, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 42119, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 42135, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 42150, 0x00002A27 }, /* GL_T2F_V3F */
+   { 42161, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 42180, 0x00002A28 }, /* GL_T4F_V4F */
+   { 42191, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 42214, 0x00001702 }, /* GL_TEXTURE */
+   { 42225, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 42237, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 42253, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 42265, 0x000084CA }, /* GL_TEXTURE10 */
+   { 42278, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 42295, 0x000084CB }, /* GL_TEXTURE11 */
+   { 42308, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 42325, 0x000084CC }, /* GL_TEXTURE12 */
+   { 42338, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 42355, 0x000084CD }, /* GL_TEXTURE13 */
+   { 42368, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 42385, 0x000084CE }, /* GL_TEXTURE14 */
+   { 42398, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 42415, 0x000084CF }, /* GL_TEXTURE15 */
+   { 42428, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 42445, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 42458, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 42475, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 42488, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 42505, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 42518, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 42535, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 42548, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 42565, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 42581, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 42593, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 42606, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 42623, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 42636, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 42653, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 42666, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 42683, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 42696, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 42713, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 42726, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 42743, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 42756, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 42773, 0x000084DA }, /* GL_TEXTURE26 */
+   { 42786, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 42803, 0x000084DB }, /* GL_TEXTURE27 */
+   { 42816, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 42833, 0x000084DC }, /* GL_TEXTURE28 */
+   { 42846, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 42863, 0x000084DD }, /* GL_TEXTURE29 */
+   { 42876, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 42893, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 42909, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 42921, 0x000084DE }, /* GL_TEXTURE30 */
+   { 42934, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 42951, 0x000084DF }, /* GL_TEXTURE31 */
+   { 42964, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 42981, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 42997, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 43009, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 43025, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 43037, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 43053, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 43065, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 43081, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 43093, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 43109, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 43121, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 43137, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 43149, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 43165, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 43179, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 43199, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 43223, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 43237, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 43257, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 43281, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 43295, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 43313, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 43335, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 43361, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 43383, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 43405, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 43433, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 43465, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 43487, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 43515, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 43547, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 43569, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 43595, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 43621, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 43651, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 43679, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 43711, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 43743, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+   { 43775, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 43804, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 43837, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 43869, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 43884, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 43905, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 43930, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 43948, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 43972, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 43990, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 44012, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 44049, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 44090, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 44115, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 44144, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 44175, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 44205, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 44235, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 44270, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 44301, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 44339, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 44366, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 44398, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 44432, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 44456, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 44484, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 44508, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 44536, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 44569, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 44593, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 44615, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 44637, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 44663, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 44697, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 44730, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 44767, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 44795, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 44827, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 44850, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 44888, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 44930, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 44961, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 44989, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 45019, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 45047, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 45072, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 45092, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 45116, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 45147, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 45182, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 45217, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 45248, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 45283, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 45318, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 45349, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 45384, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 45419, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 45443, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 45474, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 45509, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 45544, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 45575, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 45610, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 45645, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 45676, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 45711, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 45746, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 45775, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 45792, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 45814, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 45840, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 45855, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 45876, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 45896, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
+   { 45920, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 45946, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 45976, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 45996, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 46020, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 46037, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 46054, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 46071, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 46094, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 46111, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 46136, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 46158, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 46184, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 46202, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 46228, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 46254, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 46284, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 46311, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 46336, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 46356, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 46380, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 46407, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 46434, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 46461, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 46487, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 46517, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 46539, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 46557, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 46597, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 46627, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 46655, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 46683, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 46711, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 46732, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 46751, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 46773, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 46792, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 46812, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 46842, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 46873, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 46894, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 46919, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 46943, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 46963, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 46987, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 47007, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 47030, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 47053, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 47077, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 47105, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 47135, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 47160, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 47194, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 47211, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 47229, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 47251, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 47269, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 47287, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 47306, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 47326, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 47345, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 47374, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 47391, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 47413, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 47443, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 47472, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 47508, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 47545, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 47586, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 47619, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 47653, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 47691, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 47727, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 47761, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 47799, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 47834, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 47873, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 47914, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 47959, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 47990, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 48025, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 48066, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 48111, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 48137, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 48167, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 48199, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 48229, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 48263, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 48279, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 48310, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 48345, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 48373, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 48405, 0x00000004 }, /* GL_TRIANGLES */
+   { 48418, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 48441, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 48468, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 48484, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 48505, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 48523, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 48551, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 48583, 0x00000001 }, /* GL_TRUE */
+   { 48591, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 48610, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+   { 48639, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 48659, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 48682, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 48702, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 48723, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 48745, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 48767, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 48787, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 48808, 0x00009118 }, /* GL_UNSIGNALED */
+   { 48822, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 48839, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 48866, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 48889, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 48905, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 48937, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 48964, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 48995, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 49016, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 49041, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 49065, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 49090, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 49121, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 49156, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 49184, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 49208, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 49236, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 49263, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 49296, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 49333, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 49364, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 49391, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 49424, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 49461, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 49492, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 49524, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 49560, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 49587, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 49618, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 49649, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 49684, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 49713, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 49746, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 49767, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 49792, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 49813, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 49838, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 49859, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 49884, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 49907, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 49925, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 49955, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 49989, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 50015, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 50045, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 50079, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 50105, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 50129, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 50157, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 50185, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 50212, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 50244, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 50275, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 50289, 0x00002A20 }, /* GL_V2F */
+   { 50296, 0x00002A21 }, /* GL_V3F */
+   { 50303, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 50322, 0x00001F00 }, /* GL_VENDOR */
+   { 50332, 0x00001F02 }, /* GL_VERSION */
+   { 50343, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 50359, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 50383, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 50413, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 50444, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 50479, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 50503, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 50524, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 50547, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 50568, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 50595, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 50623, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 50651, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 50679, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 50707, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 50735, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 50763, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 50790, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 50817, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 50844, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 50871, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 50898, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 50925, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 50952, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 50979, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 51006, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 51044, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 51086, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 51121, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 51152, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 51187, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 51218, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 51253, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 51287, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 51325, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 51356, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 51391, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 51419, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 51451, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 51481, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 51515, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 51543, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 51575, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 51595, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 51617, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 51646, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 51667, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 51696, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 51729, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 51761, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 51788, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 51819, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 51849, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 51866, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 51887, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 51914, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 51926, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 51942, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 51960, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 51975, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 51995, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 52026, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 52061, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 52096, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 52116, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 52144, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 52172, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 52197, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 52222, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 52249, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 52276, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 52301, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 52326, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 52350, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 52369, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 52383, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 52401, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 52419, 0x00001506 }, /* GL_XOR */
+   { 52426, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 52445, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 52459, 0x00000000 }, /* GL_ZERO */
+   { 52467, 0x00000D16 }, /* GL_ZOOM_X */
+   { 52477, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1571] =
@@ -4733,42 +4729,42 @@ static const unsigned reduced_enums[1571] =
        853, /* GL_LINES */
        857, /* GL_LINE_LOOP */
        864, /* GL_LINE_STRIP */
-      2181, /* GL_TRIANGLES */
-      2186, /* GL_TRIANGLE_STRIP */
-      2184, /* GL_TRIANGLE_FAN */
-      1541, /* GL_QUADS */
-      1545, /* GL_QUAD_STRIP */
-      1409, /* GL_POLYGON */
+      2179, /* GL_TRIANGLES */
+      2184, /* GL_TRIANGLE_STRIP */
+      2182, /* GL_TRIANGLE_FAN */
+      1539, /* GL_QUADS */
+      1543, /* GL_QUAD_STRIP */
+      1407, /* GL_POLYGON */
        854, /* GL_LINES_ADJACENCY */
        865, /* GL_LINE_STRIP_ADJACENCY */
-      2182, /* GL_TRIANGLES_ADJACENCY */
-      2187, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1421, /* GL_POLYGON_STIPPLE_BIT */
-      1364, /* GL_PIXEL_MODE_BIT */
+      2180, /* GL_TRIANGLES_ADJACENCY */
+      2185, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1419, /* GL_POLYGON_STIPPLE_BIT */
+      1362, /* GL_PIXEL_MODE_BIT */
        840, /* GL_LIGHTING_BIT */
        590, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
        876, /* GL_LOAD */
-      1632, /* GL_RETURN */
-      1229, /* GL_MULT */
+      1630, /* GL_RETURN */
+      1227, /* GL_MULT */
         24, /* GL_ADD */
-      1245, /* GL_NEVER */
+      1243, /* GL_NEVER */
        830, /* GL_LESS */
        545, /* GL_EQUAL */
        829, /* GL_LEQUAL */
        714, /* GL_GREATER */
-      1262, /* GL_NOTEQUAL */
+      1260, /* GL_NOTEQUAL */
        712, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1843, /* GL_SRC_COLOR */
-      1297, /* GL_ONE_MINUS_SRC_COLOR */
-      1841, /* GL_SRC_ALPHA */
-      1296, /* GL_ONE_MINUS_SRC_ALPHA */
+      1841, /* GL_SRC_COLOR */
+      1295, /* GL_ONE_MINUS_SRC_COLOR */
+      1839, /* GL_SRC_ALPHA */
+      1294, /* GL_ONE_MINUS_SRC_ALPHA */
        524, /* GL_DST_ALPHA */
-      1294, /* GL_ONE_MINUS_DST_ALPHA */
+      1292, /* GL_ONE_MINUS_DST_ALPHA */
        525, /* GL_DST_COLOR */
-      1295, /* GL_ONE_MINUS_DST_COLOR */
-      1842, /* GL_SRC_ALPHA_SATURATE */
+      1293, /* GL_ONE_MINUS_DST_COLOR */
+      1840, /* GL_SRC_ALPHA_SATURATE */
        689, /* GL_FRONT_LEFT */
        690, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
@@ -4776,7 +4772,7 @@ static const unsigned reduced_enums[1571] =
        686, /* GL_FRONT */
         76, /* GL_BACK */
        828, /* GL_LEFT */
-      1723, /* GL_RIGHT */
+      1721, /* GL_RIGHT */
        687, /* GL_FRONT_AND_BACK */
         71, /* GL_AUX0 */
         72, /* GL_AUX1 */
@@ -4785,19 +4781,19 @@ static const unsigned reduced_enums[1571] =
        816, /* GL_INVALID_ENUM */
        821, /* GL_INVALID_VALUE */
        820, /* GL_INVALID_OPERATION */
-      1848, /* GL_STACK_OVERFLOW */
-      1849, /* GL_STACK_UNDERFLOW */
-      1322, /* GL_OUT_OF_MEMORY */
+      1846, /* GL_STACK_OVERFLOW */
+      1847, /* GL_STACK_UNDERFLOW */
+      1320, /* GL_OUT_OF_MEMORY */
        817, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1342, /* GL_PASS_THROUGH_TOKEN */
-      1408, /* GL_POINT_TOKEN */
+      1340, /* GL_PASS_THROUGH_TOKEN */
+      1406, /* GL_POINT_TOKEN */
        867, /* GL_LINE_TOKEN */
-      1422, /* GL_POLYGON_TOKEN */
+      1420, /* GL_POLYGON_TOKEN */
         87, /* GL_BITMAP_TOKEN */
        523, /* GL_DRAW_PIXEL_TOKEN */
        353, /* GL_COPY_PIXEL_TOKEN */
@@ -4807,7 +4803,7 @@ static const unsigned reduced_enums[1571] =
        390, /* GL_CW */
        154, /* GL_CCW */
        187, /* GL_COEFF */
-      1319, /* GL_ORDER */
+      1317, /* GL_ORDER */
        444, /* GL_DOMAIN */
        363, /* GL_CURRENT_COLOR */
        366, /* GL_CURRENT_INDEX */
@@ -4819,10 +4815,10 @@ static const unsigned reduced_enums[1571] =
        381, /* GL_CURRENT_RASTER_POSITION */
        382, /* GL_CURRENT_RASTER_POSITION_VALID */
        379, /* GL_CURRENT_RASTER_DISTANCE */
-      1400, /* GL_POINT_SMOOTH */
-      1384, /* GL_POINT_SIZE */
-      1399, /* GL_POINT_SIZE_RANGE */
-      1390, /* GL_POINT_SIZE_GRANULARITY */
+      1398, /* GL_POINT_SMOOTH */
+      1382, /* GL_POINT_SIZE */
+      1397, /* GL_POINT_SIZE_RANGE */
+      1388, /* GL_POINT_SIZE_GRANULARITY */
        859, /* GL_LINE_SMOOTH */
        868, /* GL_LINE_WIDTH */
        870, /* GL_LINE_WIDTH_RANGE */
@@ -4834,9 +4830,9 @@ static const unsigned reduced_enums[1571] =
       1084, /* GL_MAX_LIST_NESTING */
        872, /* GL_LIST_BASE */
        874, /* GL_LIST_INDEX */
-      1411, /* GL_POLYGON_MODE */
-      1418, /* GL_POLYGON_SMOOTH */
-      1420, /* GL_POLYGON_STIPPLE */
+      1409, /* GL_POLYGON_MODE */
+      1416, /* GL_POLYGON_SMOOTH */
+      1418, /* GL_POLYGON_STIPPLE */
        534, /* GL_EDGE_FLAG */
        356, /* GL_CULL_FACE */
        357, /* GL_CULL_FACE_MODE */
@@ -4845,7 +4841,7 @@ static const unsigned reduced_enums[1571] =
        844, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        845, /* GL_LIGHT_MODEL_TWO_SIDE */
        841, /* GL_LIGHT_MODEL_AMBIENT */
-      1790, /* GL_SHADE_MODEL */
+      1788, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
@@ -4862,24 +4858,24 @@ static const unsigned reduced_enums[1571] =
        414, /* GL_DEPTH_CLEAR_VALUE */
        428, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1893, /* GL_STENCIL_TEST */
-      1874, /* GL_STENCIL_CLEAR_VALUE */
-      1876, /* GL_STENCIL_FUNC */
-      1895, /* GL_STENCIL_VALUE_MASK */
-      1875, /* GL_STENCIL_FAIL */
-      1890, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1891, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1892, /* GL_STENCIL_REF */
-      1896, /* GL_STENCIL_WRITEMASK */
+      1891, /* GL_STENCIL_TEST */
+      1872, /* GL_STENCIL_CLEAR_VALUE */
+      1874, /* GL_STENCIL_FUNC */
+      1893, /* GL_STENCIL_VALUE_MASK */
+      1873, /* GL_STENCIL_FAIL */
+      1888, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1889, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1890, /* GL_STENCIL_REF */
+      1894, /* GL_STENCIL_WRITEMASK */
       1033, /* GL_MATRIX_MODE */
-      1251, /* GL_NORMALIZE */
-      2314, /* GL_VIEWPORT */
-      1224, /* GL_MODELVIEW_STACK_DEPTH */
-      1515, /* GL_PROJECTION_STACK_DEPTH */
-      2135, /* GL_TEXTURE_STACK_DEPTH */
-      1221, /* GL_MODELVIEW_MATRIX */
-      1513, /* GL_PROJECTION_MATRIX */
-      2115, /* GL_TEXTURE_MATRIX */
+      1249, /* GL_NORMALIZE */
+      2312, /* GL_VIEWPORT */
+      1222, /* GL_MODELVIEW_STACK_DEPTH */
+      1513, /* GL_PROJECTION_STACK_DEPTH */
+      2133, /* GL_TEXTURE_STACK_DEPTH */
+      1219, /* GL_MODELVIEW_MATRIX */
+      1511, /* GL_PROJECTION_MATRIX */
+      2113, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
@@ -4894,67 +4890,67 @@ static const unsigned reduced_enums[1571] =
        233, /* GL_COLOR_LOGIC_OP */
         75, /* GL_AUX_BUFFERS */
        454, /* GL_DRAW_BUFFER */
-      1568, /* GL_READ_BUFFER */
-      1767, /* GL_SCISSOR_BOX */
-      1768, /* GL_SCISSOR_TEST */
+      1566, /* GL_READ_BUFFER */
+      1765, /* GL_SCISSOR_BOX */
+      1766, /* GL_SCISSOR_TEST */
        762, /* GL_INDEX_CLEAR_VALUE */
        767, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
        272, /* GL_COLOR_WRITEMASK */
        764, /* GL_INDEX_MODE */
-      1712, /* GL_RGBA_MODE */
+      1710, /* GL_RGBA_MODE */
        453, /* GL_DOUBLEBUFFER */
-      1897, /* GL_STEREO */
-      1622, /* GL_RENDER_MODE */
-      1343, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1401, /* GL_POINT_SMOOTH_HINT */
+      1895, /* GL_STEREO */
+      1620, /* GL_RENDER_MODE */
+      1341, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1399, /* GL_POINT_SMOOTH_HINT */
        860, /* GL_LINE_SMOOTH_HINT */
-      1419, /* GL_POLYGON_SMOOTH_HINT */
+      1417, /* GL_POLYGON_SMOOTH_HINT */
        610, /* GL_FOG_HINT */
-      2095, /* GL_TEXTURE_GEN_S */
-      2097, /* GL_TEXTURE_GEN_T */
-      2094, /* GL_TEXTURE_GEN_R */
-      2093, /* GL_TEXTURE_GEN_Q */
-      1356, /* GL_PIXEL_MAP_I_TO_I */
-      1362, /* GL_PIXEL_MAP_S_TO_S */
-      1358, /* GL_PIXEL_MAP_I_TO_R */
-      1354, /* GL_PIXEL_MAP_I_TO_G */
-      1352, /* GL_PIXEL_MAP_I_TO_B */
-      1350, /* GL_PIXEL_MAP_I_TO_A */
-      1360, /* GL_PIXEL_MAP_R_TO_R */
-      1348, /* GL_PIXEL_MAP_G_TO_G */
-      1346, /* GL_PIXEL_MAP_B_TO_B */
-      1344, /* GL_PIXEL_MAP_A_TO_A */
-      1357, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1363, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1359, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1355, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1353, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1351, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1361, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1349, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1347, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1345, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2199, /* GL_UNPACK_SWAP_BYTES */
-      2194, /* GL_UNPACK_LSB_FIRST */
-      2195, /* GL_UNPACK_ROW_LENGTH */
-      2198, /* GL_UNPACK_SKIP_ROWS */
-      2197, /* GL_UNPACK_SKIP_PIXELS */
-      2192, /* GL_UNPACK_ALIGNMENT */
-      1331, /* GL_PACK_SWAP_BYTES */
-      1326, /* GL_PACK_LSB_FIRST */
-      1327, /* GL_PACK_ROW_LENGTH */
-      1330, /* GL_PACK_SKIP_ROWS */
-      1329, /* GL_PACK_SKIP_PIXELS */
-      1323, /* GL_PACK_ALIGNMENT */
+      2093, /* GL_TEXTURE_GEN_S */
+      2095, /* GL_TEXTURE_GEN_T */
+      2092, /* GL_TEXTURE_GEN_R */
+      2091, /* GL_TEXTURE_GEN_Q */
+      1354, /* GL_PIXEL_MAP_I_TO_I */
+      1360, /* GL_PIXEL_MAP_S_TO_S */
+      1356, /* GL_PIXEL_MAP_I_TO_R */
+      1352, /* GL_PIXEL_MAP_I_TO_G */
+      1350, /* GL_PIXEL_MAP_I_TO_B */
+      1348, /* GL_PIXEL_MAP_I_TO_A */
+      1358, /* GL_PIXEL_MAP_R_TO_R */
+      1346, /* GL_PIXEL_MAP_G_TO_G */
+      1344, /* GL_PIXEL_MAP_B_TO_B */
+      1342, /* GL_PIXEL_MAP_A_TO_A */
+      1355, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1361, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1357, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1353, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1351, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1349, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1359, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1347, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1345, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1343, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2197, /* GL_UNPACK_SWAP_BYTES */
+      2192, /* GL_UNPACK_LSB_FIRST */
+      2193, /* GL_UNPACK_ROW_LENGTH */
+      2196, /* GL_UNPACK_SKIP_ROWS */
+      2195, /* GL_UNPACK_SKIP_PIXELS */
+      2190, /* GL_UNPACK_ALIGNMENT */
+      1329, /* GL_PACK_SWAP_BYTES */
+      1324, /* GL_PACK_LSB_FIRST */
+      1325, /* GL_PACK_ROW_LENGTH */
+      1328, /* GL_PACK_SKIP_ROWS */
+      1327, /* GL_PACK_SKIP_PIXELS */
+      1321, /* GL_PACK_ALIGNMENT */
        974, /* GL_MAP_COLOR */
        979, /* GL_MAP_STENCIL */
        766, /* GL_INDEX_SHIFT */
        765, /* GL_INDEX_OFFSET */
-      1584, /* GL_RED_SCALE */
-      1580, /* GL_RED_BIAS */
-      2340, /* GL_ZOOM_X */
-      2341, /* GL_ZOOM_Y */
+      1582, /* GL_RED_SCALE */
+      1578, /* GL_RED_BIAS */
+      2338, /* GL_ZOOM_X */
+      2339, /* GL_ZOOM_Y */
        720, /* GL_GREEN_SCALE */
        716, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
@@ -4966,28 +4962,28 @@ static const unsigned reduced_enums[1571] =
       1066, /* GL_MAX_EVAL_ORDER */
       1083, /* GL_MAX_LIGHTS */
       1045, /* GL_MAX_CLIP_DISTANCES */
-      1139, /* GL_MAX_TEXTURE_SIZE */
+      1138, /* GL_MAX_TEXTURE_SIZE */
       1090, /* GL_MAX_PIXEL_MAP_TABLE */
       1041, /* GL_MAX_ATTRIB_STACK_DEPTH */
       1086, /* GL_MAX_MODELVIEW_STACK_DEPTH */
       1087, /* GL_MAX_NAME_STACK_DEPTH */
-      1118, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1140, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1166, /* GL_MAX_VIEWPORT_DIMS */
+      1117, /* GL_MAX_PROJECTION_STACK_DEPTH */
+      1139, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1165, /* GL_MAX_VIEWPORT_DIMS */
       1042, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1907, /* GL_SUBPIXEL_BITS */
+      1905, /* GL_SUBPIXEL_BITS */
        761, /* GL_INDEX_BITS */
-      1581, /* GL_RED_BITS */
+      1579, /* GL_RED_BITS */
        717, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
        407, /* GL_DEPTH_BITS */
-      1871, /* GL_STENCIL_BITS */
+      1869, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1238, /* GL_NAME_STACK_DEPTH */
+      1236, /* GL_NAME_STACK_DEPTH */
         70, /* GL_AUTO_NORMAL */
        920, /* GL_MAP1_COLOR_4 */
        923, /* GL_MAP1_INDEX */
@@ -5011,39 +5007,39 @@ static const unsigned reduced_enums[1571] =
        922, /* GL_MAP1_GRID_SEGMENTS */
        948, /* GL_MAP2_GRID_DOMAIN */
        949, /* GL_MAP2_GRID_SEGMENTS */
-      1990, /* GL_TEXTURE_1D */
-      1993, /* GL_TEXTURE_2D */
+      1988, /* GL_TEXTURE_1D */
+      1991, /* GL_TEXTURE_2D */
        559, /* GL_FEEDBACK_BUFFER_POINTER */
        560, /* GL_FEEDBACK_BUFFER_SIZE */
        561, /* GL_FEEDBACK_BUFFER_TYPE */
-      1777, /* GL_SELECTION_BUFFER_POINTER */
-      1778, /* GL_SELECTION_BUFFER_SIZE */
-      2141, /* GL_TEXTURE_WIDTH */
-      2101, /* GL_TEXTURE_HEIGHT */
-      2044, /* GL_TEXTURE_COMPONENTS */
-      2022, /* GL_TEXTURE_BORDER_COLOR */
-      2021, /* GL_TEXTURE_BORDER */
+      1775, /* GL_SELECTION_BUFFER_POINTER */
+      1776, /* GL_SELECTION_BUFFER_SIZE */
+      2139, /* GL_TEXTURE_WIDTH */
+      2099, /* GL_TEXTURE_HEIGHT */
+      2042, /* GL_TEXTURE_COMPONENTS */
+      2020, /* GL_TEXTURE_BORDER_COLOR */
+      2019, /* GL_TEXTURE_BORDER */
        445, /* GL_DONT_CARE */
        557, /* GL_FASTEST */
-      1246, /* GL_NICEST */
+      1244, /* GL_NICEST */
         56, /* GL_AMBIENT */
        442, /* GL_DIFFUSE */
-      1830, /* GL_SPECULAR */
-      1423, /* GL_POSITION */
-      1833, /* GL_SPOT_DIRECTION */
-      1834, /* GL_SPOT_EXPONENT */
-      1832, /* GL_SPOT_CUTOFF */
+      1828, /* GL_SPECULAR */
+      1421, /* GL_POSITION */
+      1831, /* GL_SPOT_DIRECTION */
+      1832, /* GL_SPOT_EXPONENT */
+      1830, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
        848, /* GL_LINEAR_ATTENUATION */
-      1540, /* GL_QUADRATIC_ATTENUATION */
+      1538, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2201, /* GL_UNSIGNED_BYTE */
-      1795, /* GL_SHORT */
-      2240, /* GL_UNSIGNED_SHORT */
+      2199, /* GL_UNSIGNED_BYTE */
+      1793, /* GL_SHORT */
+      2238, /* GL_UNSIGNED_SHORT */
        770, /* GL_INT */
-      2204, /* GL_UNSIGNED_INT */
+      2202, /* GL_UNSIGNED_INT */
        570, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -5056,100 +5052,100 @@ static const unsigned reduced_enums[1571] =
         60, /* GL_AND_REVERSE */
        351, /* GL_COPY */
         59, /* GL_AND_INVERTED */
-      1249, /* GL_NOOP */
-      2336, /* GL_XOR */
-      1318, /* GL_OR */
-      1250, /* GL_NOR */
+      1247, /* GL_NOOP */
+      2334, /* GL_XOR */
+      1316, /* GL_OR */
+      1248, /* GL_NOR */
        546, /* GL_EQUIV */
        824, /* GL_INVERT */
-      1321, /* GL_OR_REVERSE */
+      1319, /* GL_OR_REVERSE */
        352, /* GL_COPY_INVERTED */
-      1320, /* GL_OR_INVERTED */
-      1239, /* GL_NAND */
-      1784, /* GL_SET */
+      1318, /* GL_OR_INVERTED */
+      1237, /* GL_NAND */
+      1782, /* GL_SET */
        543, /* GL_EMISSION */
-      1794, /* GL_SHININESS */
+      1792, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
-      1188, /* GL_MODELVIEW */
-      1512, /* GL_PROJECTION */
-      1925, /* GL_TEXTURE */
+      1186, /* GL_MODELVIEW */
+      1510, /* GL_PROJECTION */
+      1923, /* GL_TEXTURE */
        188, /* GL_COLOR */
        399, /* GL_DEPTH */
-      1856, /* GL_STENCIL */
+      1854, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1877, /* GL_STENCIL_INDEX */
+      1875, /* GL_STENCIL_INDEX */
        415, /* GL_DEPTH_COMPONENT */
-      1577, /* GL_RED */
+      1575, /* GL_RED */
        715, /* GL_GREEN */
        110, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1635, /* GL_RGB */
-      1676, /* GL_RGBA */
+      1633, /* GL_RGB */
+      1674, /* GL_RGBA */
        883, /* GL_LUMINANCE */
        910, /* GL_LUMINANCE_ALPHA */
         86, /* GL_BITMAP */
-      1373, /* GL_POINT */
+      1371, /* GL_POINT */
        846, /* GL_LINE */
        562, /* GL_FILL */
-      1591, /* GL_RENDER */
+      1589, /* GL_RENDER */
        558, /* GL_FEEDBACK */
-      1776, /* GL_SELECT */
+      1774, /* GL_SELECT */
        569, /* GL_FLAT */
-      1805, /* GL_SMOOTH */
+      1803, /* GL_SMOOTH */
        825, /* GL_KEEP */
-      1624, /* GL_REPLACE */
+      1622, /* GL_REPLACE */
        751, /* GL_INCR */
        395, /* GL_DECR */
-      2257, /* GL_VENDOR */
-      1621, /* GL_RENDERER */
-      2258, /* GL_VERSION */
+      2255, /* GL_VENDOR */
+      1619, /* GL_RENDERER */
+      2256, /* GL_VERSION */
        551, /* GL_EXTENSIONS */
-      1724, /* GL_S */
-      1916, /* GL_T */
-      1560, /* GL_R */
-      1539, /* GL_Q */
-      1225, /* GL_MODULATE */
+      1722, /* GL_S */
+      1914, /* GL_T */
+      1558, /* GL_R */
+      1537, /* GL_Q */
+      1223, /* GL_MODULATE */
        394, /* GL_DECAL */
-      2087, /* GL_TEXTURE_ENV_MODE */
-      2086, /* GL_TEXTURE_ENV_COLOR */
-      2085, /* GL_TEXTURE_ENV */
+      2085, /* GL_TEXTURE_ENV_MODE */
+      2084, /* GL_TEXTURE_ENV_COLOR */
+      2083, /* GL_TEXTURE_ENV */
        552, /* GL_EYE_LINEAR */
-      1279, /* GL_OBJECT_LINEAR */
-      1831, /* GL_SPHERE_MAP */
-      2091, /* GL_TEXTURE_GEN_MODE */
-      1281, /* GL_OBJECT_PLANE */
+      1277, /* GL_OBJECT_LINEAR */
+      1829, /* GL_SPHERE_MAP */
+      2089, /* GL_TEXTURE_GEN_MODE */
+      1279, /* GL_OBJECT_PLANE */
        553, /* GL_EYE_PLANE */
-      1240, /* GL_NEAREST */
+      1238, /* GL_NEAREST */
        847, /* GL_LINEAR */
-      1244, /* GL_NEAREST_MIPMAP_NEAREST */
+      1242, /* GL_NEAREST_MIPMAP_NEAREST */
        852, /* GL_LINEAR_MIPMAP_NEAREST */
-      1243, /* GL_NEAREST_MIPMAP_LINEAR */
+      1241, /* GL_NEAREST_MIPMAP_LINEAR */
        851, /* GL_LINEAR_MIPMAP_LINEAR */
-      2114, /* GL_TEXTURE_MAG_FILTER */
-      2123, /* GL_TEXTURE_MIN_FILTER */
-      2144, /* GL_TEXTURE_WRAP_S */
-      2145, /* GL_TEXTURE_WRAP_T */
+      2112, /* GL_TEXTURE_MAG_FILTER */
+      2121, /* GL_TEXTURE_MIN_FILTER */
+      2142, /* GL_TEXTURE_WRAP_S */
+      2143, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
-      1623, /* GL_REPEAT */
-      1417, /* GL_POLYGON_OFFSET_UNITS */
-      1416, /* GL_POLYGON_OFFSET_POINT */
-      1415, /* GL_POLYGON_OFFSET_LINE */
-      1563, /* GL_R3_G3_B2 */
-      2254, /* GL_V2F */
-      2255, /* GL_V3F */
+      1621, /* GL_REPEAT */
+      1415, /* GL_POLYGON_OFFSET_UNITS */
+      1414, /* GL_POLYGON_OFFSET_POINT */
+      1413, /* GL_POLYGON_OFFSET_LINE */
+      1561, /* GL_R3_G3_B2 */
+      2252, /* GL_V2F */
+      2253, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
-      1237, /* GL_N3F_V3F */
+      1235, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1921, /* GL_T2F_V3F */
-      1923, /* GL_T4F_V4F */
-      1919, /* GL_T2F_C4UB_V3F */
-      1917, /* GL_T2F_C3F_V3F */
-      1920, /* GL_T2F_N3F_V3F */
-      1918, /* GL_T2F_C4F_N3F_V3F */
-      1922, /* GL_T4F_C4F_N3F_V4F */
+      1919, /* GL_T2F_V3F */
+      1921, /* GL_T4F_V4F */
+      1917, /* GL_T2F_C4UB_V3F */
+      1915, /* GL_T2F_C3F_V3F */
+      1918, /* GL_T2F_N3F_V3F */
+      1916, /* GL_T2F_C4F_N3F_V3F */
+      1920, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5168,38 +5164,38 @@ static const unsigned reduced_enums[1571] =
        838, /* GL_LIGHT7 */
        726, /* GL_HINT_BIT */
        322, /* GL_CONSTANT_COLOR */
-      1292, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1290, /* GL_ONE_MINUS_CONSTANT_COLOR */
        317, /* GL_CONSTANT_ALPHA */
-      1290, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1288, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         89, /* GL_BLEND_COLOR */
        691, /* GL_FUNC_ADD */
-      1169, /* GL_MIN */
+      1168, /* GL_MIN */
       1036, /* GL_MAX */
         96, /* GL_BLEND_EQUATION */
        697, /* GL_FUNC_SUBTRACT */
        694, /* GL_FUNC_REVERSE_SUBTRACT */
        331, /* GL_CONVOLUTION_1D */
        332, /* GL_CONVOLUTION_2D */
-      1779, /* GL_SEPARABLE_2D */
+      1777, /* GL_SEPARABLE_2D */
        335, /* GL_CONVOLUTION_BORDER_MODE */
        339, /* GL_CONVOLUTION_FILTER_SCALE */
        337, /* GL_CONVOLUTION_FILTER_BIAS */
-      1578, /* GL_REDUCE */
+      1576, /* GL_REDUCE */
        341, /* GL_CONVOLUTION_FORMAT */
        345, /* GL_CONVOLUTION_WIDTH */
        343, /* GL_CONVOLUTION_HEIGHT */
       1055, /* GL_MAX_CONVOLUTION_WIDTH */
       1053, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1456, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1452, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1447, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1443, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1454, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1450, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1445, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1441, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+      1454, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1450, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1445, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1441, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1452, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1448, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1443, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1439, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
        727, /* GL_HISTOGRAM */
-      1519, /* GL_PROXY_HISTOGRAM */
+      1517, /* GL_PROXY_HISTOGRAM */
        743, /* GL_HISTOGRAM_WIDTH */
        733, /* GL_HISTOGRAM_FORMAT */
        739, /* GL_HISTOGRAM_RED_SIZE */
@@ -5208,19 +5204,19 @@ static const unsigned reduced_enums[1571] =
        728, /* GL_HISTOGRAM_ALPHA_SIZE */
        737, /* GL_HISTOGRAM_LUMINANCE_SIZE */
        741, /* GL_HISTOGRAM_SINK */
-      1170, /* GL_MINMAX */
-      1172, /* GL_MINMAX_FORMAT */
-      1174, /* GL_MINMAX_SINK */
-      1924, /* GL_TABLE_TOO_LARGE_EXT */
-      2203, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2243, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2246, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2215, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2206, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1414, /* GL_POLYGON_OFFSET_FILL */
-      1413, /* GL_POLYGON_OFFSET_FACTOR */
-      1412, /* GL_POLYGON_OFFSET_BIAS */
-      1628, /* GL_RESCALE_NORMAL */
+      1169, /* GL_MINMAX */
+      1171, /* GL_MINMAX_FORMAT */
+      1173, /* GL_MINMAX_SINK */
+      1922, /* GL_TABLE_TOO_LARGE_EXT */
+      2201, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2241, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2244, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2213, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2204, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1412, /* GL_POLYGON_OFFSET_FILL */
+      1411, /* GL_POLYGON_OFFSET_FACTOR */
+      1410, /* GL_POLYGON_OFFSET_BIAS */
+      1626, /* GL_RESCALE_NORMAL */
         41, /* GL_ALPHA4 */
         43, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
@@ -5240,102 +5236,102 @@ static const unsigned reduced_enums[1571] =
        782, /* GL_INTENSITY8 */
        772, /* GL_INTENSITY12 */
        774, /* GL_INTENSITY16 */
-      1651, /* GL_RGB2_EXT */
-      1657, /* GL_RGB4 */
-      1660, /* GL_RGB5 */
-      1667, /* GL_RGB8 */
-      1636, /* GL_RGB10 */
-      1641, /* GL_RGB12 */
-      1643, /* GL_RGB16 */
-      1687, /* GL_RGBA2 */
-      1694, /* GL_RGBA4 */
-      1663, /* GL_RGB5_A1 */
-      1699, /* GL_RGBA8 */
-      1637, /* GL_RGB10_A2 */
-      1677, /* GL_RGBA12 */
-      1679, /* GL_RGBA16 */
-      2131, /* GL_TEXTURE_RED_SIZE */
-      2099, /* GL_TEXTURE_GREEN_SIZE */
-      2019, /* GL_TEXTURE_BLUE_SIZE */
-      1998, /* GL_TEXTURE_ALPHA_SIZE */
-      2112, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2103, /* GL_TEXTURE_INTENSITY_SIZE */
-      1625, /* GL_REPLACE_EXT */
-      1523, /* GL_PROXY_TEXTURE_1D */
-      1527, /* GL_PROXY_TEXTURE_2D */
-      2139, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2125, /* GL_TEXTURE_PRIORITY */
-      2133, /* GL_TEXTURE_RESIDENT */
-      2001, /* GL_TEXTURE_BINDING_1D */
-      2004, /* GL_TEXTURE_BINDING_2D */
-      2007, /* GL_TEXTURE_BINDING_3D */
-      1328, /* GL_PACK_SKIP_IMAGES */
-      1324, /* GL_PACK_IMAGE_HEIGHT */
-      2196, /* GL_UNPACK_SKIP_IMAGES */
-      2193, /* GL_UNPACK_IMAGE_HEIGHT */
-      1996, /* GL_TEXTURE_3D */
-      1531, /* GL_PROXY_TEXTURE_3D */
-      2082, /* GL_TEXTURE_DEPTH */
-      2142, /* GL_TEXTURE_WRAP_R */
+      1649, /* GL_RGB2_EXT */
+      1655, /* GL_RGB4 */
+      1658, /* GL_RGB5 */
+      1665, /* GL_RGB8 */
+      1634, /* GL_RGB10 */
+      1639, /* GL_RGB12 */
+      1641, /* GL_RGB16 */
+      1685, /* GL_RGBA2 */
+      1692, /* GL_RGBA4 */
+      1661, /* GL_RGB5_A1 */
+      1697, /* GL_RGBA8 */
+      1635, /* GL_RGB10_A2 */
+      1675, /* GL_RGBA12 */
+      1677, /* GL_RGBA16 */
+      2129, /* GL_TEXTURE_RED_SIZE */
+      2097, /* GL_TEXTURE_GREEN_SIZE */
+      2017, /* GL_TEXTURE_BLUE_SIZE */
+      1996, /* GL_TEXTURE_ALPHA_SIZE */
+      2110, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2101, /* GL_TEXTURE_INTENSITY_SIZE */
+      1623, /* GL_REPLACE_EXT */
+      1521, /* GL_PROXY_TEXTURE_1D */
+      1525, /* GL_PROXY_TEXTURE_2D */
+      2137, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2123, /* GL_TEXTURE_PRIORITY */
+      2131, /* GL_TEXTURE_RESIDENT */
+      1999, /* GL_TEXTURE_BINDING_1D */
+      2002, /* GL_TEXTURE_BINDING_2D */
+      2005, /* GL_TEXTURE_BINDING_3D */
+      1326, /* GL_PACK_SKIP_IMAGES */
+      1322, /* GL_PACK_IMAGE_HEIGHT */
+      2194, /* GL_UNPACK_SKIP_IMAGES */
+      2191, /* GL_UNPACK_IMAGE_HEIGHT */
+      1994, /* GL_TEXTURE_3D */
+      1529, /* GL_PROXY_TEXTURE_3D */
+      2080, /* GL_TEXTURE_DEPTH */
+      2140, /* GL_TEXTURE_WRAP_R */
       1037, /* GL_MAX_3D_TEXTURE_SIZE */
-      2259, /* GL_VERTEX_ARRAY */
-      1252, /* GL_NORMAL_ARRAY */
+      2257, /* GL_VERTEX_ARRAY */
+      1250, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
        755, /* GL_INDEX_ARRAY */
-      2052, /* GL_TEXTURE_COORD_ARRAY */
+      2050, /* GL_TEXTURE_COORD_ARRAY */
        535, /* GL_EDGE_FLAG_ARRAY */
-      2265, /* GL_VERTEX_ARRAY_SIZE */
-      2267, /* GL_VERTEX_ARRAY_TYPE */
-      2266, /* GL_VERTEX_ARRAY_STRIDE */
-      1257, /* GL_NORMAL_ARRAY_TYPE */
-      1256, /* GL_NORMAL_ARRAY_STRIDE */
+      2263, /* GL_VERTEX_ARRAY_SIZE */
+      2265, /* GL_VERTEX_ARRAY_TYPE */
+      2264, /* GL_VERTEX_ARRAY_STRIDE */
+      1255, /* GL_NORMAL_ARRAY_TYPE */
+      1254, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
        195, /* GL_COLOR_ARRAY_TYPE */
        194, /* GL_COLOR_ARRAY_STRIDE */
        760, /* GL_INDEX_ARRAY_TYPE */
        759, /* GL_INDEX_ARRAY_STRIDE */
-      2056, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2058, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2057, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      2054, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2056, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2055, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        539, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2264, /* GL_VERTEX_ARRAY_POINTER */
-      1255, /* GL_NORMAL_ARRAY_POINTER */
+      2262, /* GL_VERTEX_ARRAY_POINTER */
+      1253, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
        758, /* GL_INDEX_ARRAY_POINTER */
-      2055, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      2053, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        538, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1230, /* GL_MULTISAMPLE */
-      1753, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1755, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1760, /* GL_SAMPLE_COVERAGE */
-      1757, /* GL_SAMPLE_BUFFERS */
-      1748, /* GL_SAMPLES */
-      1764, /* GL_SAMPLE_COVERAGE_VALUE */
-      1762, /* GL_SAMPLE_COVERAGE_INVERT */
+      1228, /* GL_MULTISAMPLE */
+      1751, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1753, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1758, /* GL_SAMPLE_COVERAGE */
+      1755, /* GL_SAMPLE_BUFFERS */
+      1746, /* GL_SAMPLES */
+      1762, /* GL_SAMPLE_COVERAGE_VALUE */
+      1760, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
       1049, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1439, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1435, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1430, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1426, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1437, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1433, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1428, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1424, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2035, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1532, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2037, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1437, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1433, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1428, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1424, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1435, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1431, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1426, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1422, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2033, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1530, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2035, /* 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 */
-      1449, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1432, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1518, /* GL_PROXY_COLOR_TABLE */
-      1522, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1521, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1447, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1430, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1516, /* GL_PROXY_COLOR_TABLE */
+      1520, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1519, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        267, /* GL_COLOR_TABLE_SCALE */
        247, /* GL_COLOR_TABLE_BIAS */
        252, /* GL_COLOR_TABLE_FORMAT */
@@ -5350,60 +5346,60 @@ static const unsigned reduced_enums[1571] =
         80, /* GL_BGRA */
       1065, /* GL_MAX_ELEMENTS_VERTICES */
       1064, /* GL_MAX_ELEMENTS_INDICES */
-      2102, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      2100, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1395, /* GL_POINT_SIZE_MIN */
-      1391, /* GL_POINT_SIZE_MAX */
-      1380, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1376, /* GL_POINT_DISTANCE_ATTENUATION */
+      1393, /* GL_POINT_SIZE_MIN */
+      1389, /* GL_POINT_SIZE_MAX */
+      1378, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1374, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2124, /* GL_TEXTURE_MIN_LOD */
-      2122, /* GL_TEXTURE_MAX_LOD */
-      2000, /* GL_TEXTURE_BASE_LEVEL */
-      2121, /* GL_TEXTURE_MAX_LEVEL */
+      2122, /* GL_TEXTURE_MIN_LOD */
+      2120, /* GL_TEXTURE_MAX_LOD */
+      1998, /* GL_TEXTURE_BASE_LEVEL */
+      2119, /* GL_TEXTURE_MAX_LEVEL */
        746, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
-      1626, /* GL_REPLICATE_BORDER_HP */
+      1624, /* GL_REPLICATE_BORDER_HP */
        333, /* GL_CONVOLUTION_BORDER_COLOR */
-      1287, /* GL_OCCLUSION_TEST_HP */
-      1288, /* GL_OCCLUSION_TEST_RESULT_HP */
+      1285, /* GL_OCCLUSION_TEST_HP */
+      1286, /* GL_OCCLUSION_TEST_RESULT_HP */
        849, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      2029, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      2031, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      2033, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      2034, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      2032, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      2030, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      2027, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      2029, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      2031, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2032, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      2030, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      2028, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
       1043, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
       1044, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1459, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1461, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1458, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1460, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2110, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2111, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2109, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1457, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1459, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1456, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1458, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2108, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2109, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2107, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        700, /* GL_GENERATE_MIPMAP */
        701, /* GL_GENERATE_MIPMAP_HINT */
        613, /* GL_FOG_OFFSET_SGIX */
        614, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2043, /* GL_TEXTURE_COMPARE_SGIX */
-      2042, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2106, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2098, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      2041, /* GL_TEXTURE_COMPARE_SGIX */
+      2040, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2104, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2096, /* GL_TEXTURE_GEQUAL_R_SGIX */
        416, /* GL_DEPTH_COMPONENT16 */
        420, /* GL_DEPTH_COMPONENT24 */
        424, /* GL_DEPTH_COMPONENT32 */
        358, /* GL_CULL_VERTEX_EXT */
        360, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        359, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2332, /* GL_WRAP_BORDER_SUN */
-      2036, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      2330, /* GL_WRAP_BORDER_SUN */
+      2034, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        842, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1798, /* GL_SINGLE_COLOR */
-      1782, /* GL_SEPARATE_SPECULAR_COLOR */
-      1793, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1796, /* GL_SINGLE_COLOR */
+      1780, /* GL_SEPARATE_SPECULAR_COLOR */
+      1791, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        625, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        626, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        637, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -5416,44 +5412,44 @@ static const unsigned reduced_enums[1571] =
        682, /* GL_FRAMEBUFFER_UNDEFINED */
        432, /* GL_DEPTH_STENCIL_ATTACHMENT */
        919, /* GL_MAJOR_VERSION */
-      1176, /* GL_MINOR_VERSION */
-      1267, /* GL_NUM_EXTENSIONS */
+      1175, /* GL_MINOR_VERSION */
+      1265, /* GL_NUM_EXTENSIONS */
        327, /* GL_CONTEXT_FLAGS */
        754, /* GL_INDEX */
        410, /* GL_DEPTH_BUFFER */
-      1872, /* GL_STENCIL_BUFFER */
+      1870, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
        879, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
        721, /* GL_GUILTY_CONTEXT_RESET_ARB */
        769, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-      2191, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-      1630, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-      1481, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-      1264, /* GL_NO_RESET_NOTIFICATION_ARB */
-      2202, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2247, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2248, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2244, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2241, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2216, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2212, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2119, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2120, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2118, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1180, /* GL_MIRRORED_REPEAT */
-      1717, /* GL_RGB_S3TC */
-      1659, /* GL_RGB4_S3TC */
-      1713, /* GL_RGBA_S3TC */
-      1698, /* GL_RGBA4_S3TC */
-      1707, /* GL_RGBA_DXT5_S3TC */
-      1695, /* GL_RGBA4_DXT5_S3TC */
+      2189, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+      1628, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      1479, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+      1262, /* GL_NO_RESET_NOTIFICATION_ARB */
+      2200, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2245, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2246, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2242, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2239, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2214, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2210, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2117, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2118, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2116, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1178, /* GL_MIRRORED_REPEAT */
+      1715, /* GL_RGB_S3TC */
+      1657, /* GL_RGB4_S3TC */
+      1711, /* GL_RGBA_S3TC */
+      1696, /* GL_RGBA4_S3TC */
+      1705, /* GL_RGBA_DXT5_S3TC */
+      1693, /* 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 */
-      1242, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1241, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+      1240, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1239, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
        850, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
        600, /* GL_FOG_COORDINATE_SOURCE */
        592, /* GL_FOG_COORD */
@@ -5465,149 +5461,149 @@ static const unsigned reduced_enums[1571] =
        594, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        385, /* GL_CURRENT_SECONDARY_COLOR */
-      1773, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1775, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1774, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1772, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1769, /* GL_SECONDARY_COLOR_ARRAY */
+      1771, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1773, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1772, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1770, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1767, /* GL_SECONDARY_COLOR_ARRAY */
        383, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1926, /* GL_TEXTURE0 */
-      1928, /* GL_TEXTURE1 */
-      1950, /* GL_TEXTURE2 */
-      1972, /* GL_TEXTURE3 */
-      1978, /* GL_TEXTURE4 */
-      1980, /* GL_TEXTURE5 */
-      1982, /* GL_TEXTURE6 */
-      1984, /* GL_TEXTURE7 */
-      1986, /* GL_TEXTURE8 */
-      1988, /* GL_TEXTURE9 */
-      1929, /* GL_TEXTURE10 */
-      1931, /* GL_TEXTURE11 */
-      1933, /* GL_TEXTURE12 */
-      1935, /* GL_TEXTURE13 */
-      1937, /* GL_TEXTURE14 */
-      1939, /* GL_TEXTURE15 */
-      1941, /* GL_TEXTURE16 */
-      1943, /* GL_TEXTURE17 */
-      1945, /* GL_TEXTURE18 */
-      1947, /* GL_TEXTURE19 */
-      1951, /* GL_TEXTURE20 */
-      1953, /* GL_TEXTURE21 */
-      1955, /* GL_TEXTURE22 */
-      1957, /* GL_TEXTURE23 */
-      1959, /* GL_TEXTURE24 */
-      1961, /* GL_TEXTURE25 */
-      1963, /* GL_TEXTURE26 */
-      1965, /* GL_TEXTURE27 */
-      1967, /* GL_TEXTURE28 */
-      1969, /* GL_TEXTURE29 */
-      1973, /* GL_TEXTURE30 */
-      1975, /* GL_TEXTURE31 */
+      1924, /* GL_TEXTURE0 */
+      1926, /* GL_TEXTURE1 */
+      1948, /* GL_TEXTURE2 */
+      1970, /* GL_TEXTURE3 */
+      1976, /* GL_TEXTURE4 */
+      1978, /* GL_TEXTURE5 */
+      1980, /* GL_TEXTURE6 */
+      1982, /* GL_TEXTURE7 */
+      1984, /* GL_TEXTURE8 */
+      1986, /* GL_TEXTURE9 */
+      1927, /* GL_TEXTURE10 */
+      1929, /* GL_TEXTURE11 */
+      1931, /* GL_TEXTURE12 */
+      1933, /* GL_TEXTURE13 */
+      1935, /* GL_TEXTURE14 */
+      1937, /* GL_TEXTURE15 */
+      1939, /* GL_TEXTURE16 */
+      1941, /* GL_TEXTURE17 */
+      1943, /* GL_TEXTURE18 */
+      1945, /* GL_TEXTURE19 */
+      1949, /* GL_TEXTURE20 */
+      1951, /* GL_TEXTURE21 */
+      1953, /* GL_TEXTURE22 */
+      1955, /* GL_TEXTURE23 */
+      1957, /* GL_TEXTURE24 */
+      1959, /* GL_TEXTURE25 */
+      1961, /* GL_TEXTURE26 */
+      1963, /* GL_TEXTURE27 */
+      1965, /* GL_TEXTURE28 */
+      1967, /* GL_TEXTURE29 */
+      1971, /* GL_TEXTURE30 */
+      1973, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1141, /* GL_MAX_TEXTURE_UNITS */
-      2174, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2177, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2179, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2171, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1908, /* GL_SUBTRACT */
-      1122, /* GL_MAX_RENDERBUFFER_SIZE */
+      1140, /* GL_MAX_TEXTURE_UNITS */
+      2172, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2175, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2177, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2169, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1906, /* GL_SUBTRACT */
+      1121, /* GL_MAX_RENDERBUFFER_SIZE */
        290, /* GL_COMPRESSED_ALPHA */
        294, /* GL_COMPRESSED_LUMINANCE */
        295, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        292, /* GL_COMPRESSED_INTENSITY */
        300, /* GL_COMPRESSED_RGB */
        301, /* GL_COMPRESSED_RGBA */
-      2050, /* GL_TEXTURE_COMPRESSION_HINT */
-      2128, /* GL_TEXTURE_RECTANGLE */
-      2015, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1535, /* GL_PROXY_TEXTURE_RECTANGLE */
-      1119, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+      2048, /* GL_TEXTURE_COMPRESSION_HINT */
+      2126, /* GL_TEXTURE_RECTANGLE */
+      2013, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1533, /* GL_PROXY_TEXTURE_RECTANGLE */
+      1118, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
        431, /* GL_DEPTH_STENCIL */
-      2208, /* GL_UNSIGNED_INT_24_8 */
-      1136, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2117, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1138, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2089, /* GL_TEXTURE_FILTER_CONTROL */
-      2107, /* GL_TEXTURE_LOD_BIAS */
+      2206, /* GL_UNSIGNED_INT_24_8 */
+      1135, /* GL_MAX_TEXTURE_LOD_BIAS */
+      2115, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1137, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      2087, /* GL_TEXTURE_FILTER_CONTROL */
+      2105, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
-      1128, /* GL_MAX_SHININESS_NV */
-      1129, /* GL_MAX_SPOT_EXPONENT_NV */
+      1127, /* GL_MAX_SHININESS_NV */
+      1128, /* GL_MAX_SPOT_EXPONENT_NV */
        752, /* GL_INCR_WRAP */
        396, /* GL_DECR_WRAP */
-      1200, /* GL_MODELVIEW1_ARB */
-      1258, /* GL_NORMAL_MAP */
-      1586, /* GL_REFLECTION_MAP */
-      2060, /* GL_TEXTURE_CUBE_MAP */
-      2011, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2072, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2062, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2075, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2065, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2078, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2068, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1533, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1198, /* GL_MODELVIEW1_ARB */
+      1256, /* GL_NORMAL_MAP */
+      1584, /* GL_REFLECTION_MAP */
+      2058, /* GL_TEXTURE_CUBE_MAP */
+      2009, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2070, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2060, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2073, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2063, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2076, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2066, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1531, /* GL_PROXY_TEXTURE_CUBE_MAP */
       1057, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1236, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1473, /* GL_PRIMITIVE_RESTART_NV */
-      1472, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+      1234, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1471, /* GL_PRIMITIVE_RESTART_NV */
+      1470, /* GL_PRIMITIVE_RESTART_INDEX_NV */
        608, /* GL_FOG_DISTANCE_MODE_NV */
        555, /* GL_EYE_RADIAL_NV */
        554, /* GL_EYE_PLANE_ABSOLUTE_NV */
        273, /* GL_COMBINE */
        280, /* GL_COMBINE_RGB */
        275, /* GL_COMBINE_ALPHA */
-      1718, /* GL_RGB_SCALE */
+      1716, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
        789, /* GL_INTERPOLATE */
        316, /* GL_CONSTANT */
-      1465, /* GL_PRIMARY_COLOR */
-      1462, /* GL_PREVIOUS */
-      1813, /* GL_SOURCE0_RGB */
-      1819, /* GL_SOURCE1_RGB */
-      1825, /* GL_SOURCE2_RGB */
-      1829, /* GL_SOURCE3_RGB_NV */
-      1810, /* GL_SOURCE0_ALPHA */
-      1816, /* GL_SOURCE1_ALPHA */
-      1822, /* GL_SOURCE2_ALPHA */
-      1828, /* GL_SOURCE3_ALPHA_NV */
-      1301, /* GL_OPERAND0_RGB */
-      1307, /* GL_OPERAND1_RGB */
-      1313, /* GL_OPERAND2_RGB */
-      1317, /* GL_OPERAND3_RGB_NV */
-      1298, /* GL_OPERAND0_ALPHA */
-      1304, /* GL_OPERAND1_ALPHA */
-      1310, /* GL_OPERAND2_ALPHA */
-      1316, /* GL_OPERAND3_ALPHA_NV */
+      1463, /* GL_PRIMARY_COLOR */
+      1460, /* GL_PREVIOUS */
+      1811, /* GL_SOURCE0_RGB */
+      1817, /* GL_SOURCE1_RGB */
+      1823, /* GL_SOURCE2_RGB */
+      1827, /* GL_SOURCE3_RGB_NV */
+      1808, /* GL_SOURCE0_ALPHA */
+      1814, /* GL_SOURCE1_ALPHA */
+      1820, /* GL_SOURCE2_ALPHA */
+      1826, /* GL_SOURCE3_ALPHA_NV */
+      1299, /* GL_OPERAND0_RGB */
+      1305, /* GL_OPERAND1_RGB */
+      1311, /* GL_OPERAND2_RGB */
+      1315, /* GL_OPERAND3_RGB_NV */
+      1296, /* GL_OPERAND0_ALPHA */
+      1302, /* GL_OPERAND1_ALPHA */
+      1308, /* GL_OPERAND2_ALPHA */
+      1314, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2260, /* GL_VERTEX_ARRAY_BINDING */
-      2126, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2127, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2337, /* GL_YCBCR_422_APPLE */
-      2249, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2251, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2138, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1899, /* GL_STORAGE_PRIVATE_APPLE */
-      1898, /* GL_STORAGE_CACHED_APPLE */
-      1900, /* GL_STORAGE_SHARED_APPLE */
-      1800, /* GL_SLICE_ACCUM_SUN */
-      1544, /* GL_QUAD_MESH_SUN */
-      2185, /* GL_TRIANGLE_MESH_SUN */
-      2302, /* GL_VERTEX_PROGRAM_ARB */
-      2313, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2287, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2295, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2297, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2299, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2258, /* GL_VERTEX_ARRAY_BINDING */
+      2124, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2125, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2335, /* GL_YCBCR_422_APPLE */
+      2247, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2249, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2136, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1897, /* GL_STORAGE_PRIVATE_APPLE */
+      1896, /* GL_STORAGE_CACHED_APPLE */
+      1898, /* GL_STORAGE_SHARED_APPLE */
+      1798, /* GL_SLICE_ACCUM_SUN */
+      1542, /* GL_QUAD_MESH_SUN */
+      2183, /* GL_TRIANGLE_MESH_SUN */
+      2300, /* GL_VERTEX_PROGRAM_ARB */
+      2311, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2285, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2293, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2295, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2297, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        387, /* GL_CURRENT_VERTEX_ATTRIB */
-      1489, /* GL_PROGRAM_LENGTH_ARB */
-      1505, /* GL_PROGRAM_STRING_ARB */
-      1223, /* GL_MODELVIEW_PROJECTION_NV */
+      1487, /* GL_PROGRAM_LENGTH_ARB */
+      1503, /* GL_PROGRAM_STRING_ARB */
+      1221, /* GL_MODELVIEW_PROJECTION_NV */
        745, /* GL_IDENTITY_NV */
        822, /* GL_INVERSE_NV */
-      2176, /* GL_TRANSPOSE_NV */
+      2174, /* GL_TRANSPOSE_NV */
        823, /* GL_INVERSE_TRANSPOSE_NV */
       1103, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
       1102, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -5621,33 +5617,33 @@ static const unsigned reduced_enums[1571] =
       1019, /* GL_MATRIX7_NV */
        370, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        367, /* GL_CURRENT_MATRIX_ARB */
-      1502, /* GL_PROGRAM_POINT_SIZE */
-      2308, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1501, /* GL_PROGRAM_PARAMETER_NV */
-      2293, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1507, /* GL_PROGRAM_TARGET_NV */
-      1504, /* GL_PROGRAM_RESIDENT_NV */
-      2148, /* GL_TRACK_MATRIX_NV */
-      2149, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2303, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1483, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1500, /* GL_PROGRAM_POINT_SIZE */
+      2306, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1499, /* GL_PROGRAM_PARAMETER_NV */
+      2291, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1505, /* GL_PROGRAM_TARGET_NV */
+      1502, /* GL_PROGRAM_RESIDENT_NV */
+      2146, /* GL_TRACK_MATRIX_NV */
+      2147, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2301, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1481, /* GL_PROGRAM_ERROR_POSITION_ARB */
        412, /* GL_DEPTH_CLAMP */
-      2268, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2275, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2276, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2277, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2278, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2279, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2280, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2281, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2282, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2283, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2269, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2270, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2271, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2272, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2273, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2274, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      2266, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2273, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2274, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2275, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2276, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2277, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2278, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2279, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2280, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2281, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2267, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2268, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2269, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2270, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2271, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2272, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        931, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        938, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        939, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -5671,7 +5667,7 @@ static const unsigned reduced_enums[1571] =
        968, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
        969, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
        970, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1482, /* GL_PROGRAM_BINDING_ARB */
+      1480, /* GL_PROGRAM_BINDING_ARB */
        972, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
        973, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
        959, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
@@ -5680,66 +5676,66 @@ static const unsigned reduced_enums[1571] =
        962, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        963, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        964, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2048, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2045, /* GL_TEXTURE_COMPRESSED */
-      1265, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      2046, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2043, /* GL_TEXTURE_COMPRESSED */
+      1263, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1163, /* GL_MAX_VERTEX_UNITS_ARB */
+      1162, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2331, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2301, /* GL_VERTEX_BLEND_ARB */
+      2329, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2299, /* GL_VERTEX_BLEND_ARB */
        389, /* GL_CURRENT_WEIGHT_ARB */
-      2329, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2327, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2325, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2323, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2318, /* GL_WEIGHT_ARRAY_ARB */
+      2327, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2325, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2323, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2321, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2316, /* GL_WEIGHT_ARRAY_ARB */
        446, /* GL_DOT3_RGB */
        447, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1231, /* GL_MULTISAMPLE_3DFX */
-      1758, /* GL_SAMPLE_BUFFERS_3DFX */
-      1749, /* GL_SAMPLES_3DFX */
-      1211, /* GL_MODELVIEW2_ARB */
-      1214, /* GL_MODELVIEW3_ARB */
-      1215, /* GL_MODELVIEW4_ARB */
-      1216, /* GL_MODELVIEW5_ARB */
-      1217, /* GL_MODELVIEW6_ARB */
-      1218, /* GL_MODELVIEW7_ARB */
-      1219, /* GL_MODELVIEW8_ARB */
-      1220, /* GL_MODELVIEW9_ARB */
-      1190, /* GL_MODELVIEW10_ARB */
-      1191, /* GL_MODELVIEW11_ARB */
-      1192, /* GL_MODELVIEW12_ARB */
-      1193, /* GL_MODELVIEW13_ARB */
-      1194, /* GL_MODELVIEW14_ARB */
-      1195, /* GL_MODELVIEW15_ARB */
-      1196, /* GL_MODELVIEW16_ARB */
-      1197, /* GL_MODELVIEW17_ARB */
-      1198, /* GL_MODELVIEW18_ARB */
-      1199, /* GL_MODELVIEW19_ARB */
-      1201, /* GL_MODELVIEW20_ARB */
-      1202, /* GL_MODELVIEW21_ARB */
-      1203, /* GL_MODELVIEW22_ARB */
-      1204, /* GL_MODELVIEW23_ARB */
-      1205, /* GL_MODELVIEW24_ARB */
-      1206, /* GL_MODELVIEW25_ARB */
-      1207, /* GL_MODELVIEW26_ARB */
-      1208, /* GL_MODELVIEW27_ARB */
-      1209, /* GL_MODELVIEW28_ARB */
-      1210, /* GL_MODELVIEW29_ARB */
-      1212, /* GL_MODELVIEW30_ARB */
-      1213, /* GL_MODELVIEW31_ARB */
+      1229, /* GL_MULTISAMPLE_3DFX */
+      1756, /* GL_SAMPLE_BUFFERS_3DFX */
+      1747, /* GL_SAMPLES_3DFX */
+      1209, /* GL_MODELVIEW2_ARB */
+      1212, /* GL_MODELVIEW3_ARB */
+      1213, /* GL_MODELVIEW4_ARB */
+      1214, /* GL_MODELVIEW5_ARB */
+      1215, /* GL_MODELVIEW6_ARB */
+      1216, /* GL_MODELVIEW7_ARB */
+      1217, /* GL_MODELVIEW8_ARB */
+      1218, /* GL_MODELVIEW9_ARB */
+      1188, /* GL_MODELVIEW10_ARB */
+      1189, /* GL_MODELVIEW11_ARB */
+      1190, /* GL_MODELVIEW12_ARB */
+      1191, /* GL_MODELVIEW13_ARB */
+      1192, /* GL_MODELVIEW14_ARB */
+      1193, /* GL_MODELVIEW15_ARB */
+      1194, /* GL_MODELVIEW16_ARB */
+      1195, /* GL_MODELVIEW17_ARB */
+      1196, /* GL_MODELVIEW18_ARB */
+      1197, /* GL_MODELVIEW19_ARB */
+      1199, /* GL_MODELVIEW20_ARB */
+      1200, /* GL_MODELVIEW21_ARB */
+      1201, /* GL_MODELVIEW22_ARB */
+      1202, /* GL_MODELVIEW23_ARB */
+      1203, /* GL_MODELVIEW24_ARB */
+      1204, /* GL_MODELVIEW25_ARB */
+      1205, /* GL_MODELVIEW26_ARB */
+      1206, /* GL_MODELVIEW27_ARB */
+      1207, /* GL_MODELVIEW28_ARB */
+      1208, /* GL_MODELVIEW29_ARB */
+      1210, /* GL_MODELVIEW30_ARB */
+      1211, /* GL_MODELVIEW31_ARB */
        451, /* GL_DOT3_RGB_EXT */
-      1479, /* GL_PROGRAM_BINARY_LENGTH */
-      1184, /* GL_MIRROR_CLAMP_EXT */
-      1187, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1226, /* GL_MODULATE_ADD_ATI */
-      1227, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1228, /* GL_MODULATE_SUBTRACT_ATI */
-      2338, /* GL_YCBCR_MESA */
-      1325, /* GL_PACK_INVERT_MESA */
+      1477, /* GL_PROGRAM_BINARY_LENGTH */
+      1182, /* GL_MIRROR_CLAMP_EXT */
+      1185, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1224, /* GL_MODULATE_ADD_ATI */
+      1225, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1226, /* GL_MODULATE_SUBTRACT_ATI */
+      2336, /* GL_YCBCR_MESA */
+      1323, /* GL_PACK_INVERT_MESA */
        392, /* GL_DEBUG_OBJECT_MESA */
        393, /* GL_DEBUG_PRINT_MESA */
        391, /* GL_DEBUG_ASSERT_MESA */
@@ -5753,30 +5749,30 @@ static const unsigned reduced_enums[1571] =
        526, /* GL_DU8DV8_ATI */
        143, /* GL_BUMP_ENVMAP_ATI */
        147, /* GL_BUMP_TARGET_ATI */
-      1268, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-      1477, /* GL_PROGRAM_BINARY_FORMATS */
-      1862, /* GL_STENCIL_BACK_FUNC */
-      1860, /* GL_STENCIL_BACK_FAIL */
-      1864, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1866, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1266, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+      1475, /* GL_PROGRAM_BINARY_FORMATS */
+      1860, /* GL_STENCIL_BACK_FUNC */
+      1858, /* GL_STENCIL_BACK_FAIL */
+      1862, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1864, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        617, /* GL_FRAGMENT_PROGRAM_ARB */
-      1475, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1510, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1509, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1492, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1498, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1497, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1473, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1508, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1507, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1490, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1496, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1495, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
       1092, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1117, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1116, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1116, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1115, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
       1105, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
       1111, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
       1110, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1689, /* GL_RGBA32F */
-      1652, /* GL_RGB32F */
-      1680, /* GL_RGBA16F */
-      1644, /* GL_RGB16F */
-      1708, /* GL_RGBA_FLOAT_MODE_ARB */
+      1687, /* GL_RGBA32F */
+      1650, /* GL_RGB32F */
+      1678, /* GL_RGBA16F */
+      1642, /* GL_RGB16F */
+      1706, /* GL_RGBA_FLOAT_MODE_ARB */
       1060, /* GL_MAX_DRAW_BUFFERS */
        455, /* GL_DRAW_BUFFER0 */
        459, /* GL_DRAW_BUFFER1 */
@@ -5805,75 +5801,75 @@ static const unsigned reduced_enums[1571] =
       1031, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
       1029, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
       1025, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2083, /* GL_TEXTURE_DEPTH_SIZE */
+      2081, /* GL_TEXTURE_DEPTH_SIZE */
        439, /* GL_DEPTH_TEXTURE_MODE */
-      2040, /* GL_TEXTURE_COMPARE_MODE */
-      2038, /* GL_TEXTURE_COMPARE_FUNC */
+      2038, /* GL_TEXTURE_COMPARE_MODE */
+      2036, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
-      1402, /* GL_POINT_SPRITE */
+      1400, /* GL_POINT_SPRITE */
        347, /* GL_COORD_REPLACE */
-      1407, /* GL_POINT_SPRITE_R_MODE_NV */
-      1550, /* GL_QUERY_COUNTER_BITS */
+      1405, /* GL_POINT_SPRITE_R_MODE_NV */
+      1548, /* GL_QUERY_COUNTER_BITS */
        376, /* GL_CURRENT_QUERY */
-      1554, /* GL_QUERY_RESULT */
-      1556, /* GL_QUERY_RESULT_AVAILABLE */
-      1155, /* GL_MAX_VERTEX_ATTRIBS */
-      2291, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1552, /* GL_QUERY_RESULT */
+      1554, /* GL_QUERY_RESULT_AVAILABLE */
+      1154, /* GL_MAX_VERTEX_ATTRIBS */
+      2289, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        437, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        436, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1132, /* GL_MAX_TEXTURE_COORDS */
-      1134, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1485, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1487, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1486, /* GL_PROGRAM_FORMAT_ARB */
-      2140, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1131, /* GL_MAX_TEXTURE_COORDS */
+      1133, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1483, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1485, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1484, /* GL_PROGRAM_FORMAT_ARB */
+      2138, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        409, /* GL_DEPTH_BOUNDS_TEST_EXT */
        408, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
        540, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
        541, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2262, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1253, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+      2260, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1251, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        756, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2053, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      2051, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        536, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1770, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1768, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        595, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2319, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2284, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1488, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      2317, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2282, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1486, /* GL_PROGRAM_INSTRUCTIONS_ARB */
       1098, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1494, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1492, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
       1107, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1508, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1506, /* GL_PROGRAM_TEMPORARIES_ARB */
       1113, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1496, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1494, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
       1109, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1500, /* GL_PROGRAM_PARAMETERS_ARB */
+      1498, /* GL_PROGRAM_PARAMETERS_ARB */
       1112, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1495, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1493, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
       1108, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1476, /* GL_PROGRAM_ATTRIBS_ARB */
+      1474, /* GL_PROGRAM_ATTRIBS_ARB */
       1093, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1493, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1491, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
       1106, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1474, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1472, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
       1091, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1491, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1489, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1104, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1099, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
       1095, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1511, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2173, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1573, /* GL_READ_ONLY */
-      2333, /* GL_WRITE_ONLY */
-      1575, /* GL_READ_WRITE */
+      1509, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2171, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1571, /* GL_READ_ONLY */
+      2331, /* GL_WRITE_ONLY */
+      1573, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2147, /* GL_TIME_ELAPSED_EXT */
+      2145, /* GL_TIME_ELAPSED_EXT */
        982, /* GL_MATRIX0_ARB */
        994, /* GL_MATRIX1_ARB */
       1006, /* GL_MATRIX2_ARB */
@@ -5906,67 +5902,67 @@ static const unsigned reduced_enums[1571] =
       1005, /* GL_MATRIX29_ARB */
       1008, /* GL_MATRIX30_ARB */
       1009, /* GL_MATRIX31_ARB */
-      1903, /* GL_STREAM_DRAW */
-      1905, /* GL_STREAM_READ */
-      1901, /* GL_STREAM_COPY */
-      1852, /* GL_STATIC_DRAW */
-      1854, /* GL_STATIC_READ */
-      1850, /* GL_STATIC_COPY */
+      1901, /* GL_STREAM_DRAW */
+      1903, /* GL_STREAM_READ */
+      1899, /* GL_STREAM_COPY */
+      1850, /* GL_STATIC_DRAW */
+      1852, /* GL_STATIC_READ */
+      1848, /* GL_STATIC_COPY */
        530, /* GL_DYNAMIC_DRAW */
        532, /* GL_DYNAMIC_READ */
        528, /* GL_DYNAMIC_COPY */
-      1365, /* GL_PIXEL_PACK_BUFFER */
-      1369, /* GL_PIXEL_UNPACK_BUFFER */
-      1366, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1370, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1363, /* GL_PIXEL_PACK_BUFFER */
+      1367, /* GL_PIXEL_UNPACK_BUFFER */
+      1364, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1368, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        400, /* GL_DEPTH24_STENCIL8 */
-      2136, /* GL_TEXTURE_STENCIL_SIZE */
-      2081, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      2134, /* GL_TEXTURE_STENCIL_SIZE */
+      2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
       1094, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
       1097, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
       1101, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
       1100, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2289, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2286, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      2287, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2284, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
       1039, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-      1178, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+      1177, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
       1114, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1894, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1892, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1185, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1751, /* GL_SAMPLES_PASSED */
+      1183, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1749, /* GL_SAMPLES_PASSED */
        710, /* GL_GEOMETRY_VERTICES_OUT */
        704, /* GL_GEOMETRY_INPUT_TYPE */
        706, /* GL_GEOMETRY_OUTPUT_TYPE */
-      1741, /* GL_SAMPLER_BINDING */
+      1739, /* GL_SAMPLER_BINDING */
        164, /* GL_CLAMP_VERTEX_COLOR_ARB */
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
        567, /* GL_FIXED_ONLY */
-      1389, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1388, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1387, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1222, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1514, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2116, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1387, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1386, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1385, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1220, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1512, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2114, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1590, /* GL_RELEASED_APPLE */
-      2316, /* GL_VOLATILE_APPLE */
-      1631, /* GL_RETAINED_APPLE */
-      2190, /* GL_UNDEFINED_APPLE */
-      1538, /* GL_PURGEABLE_APPLE */
+      1588, /* GL_RELEASED_APPLE */
+      2314, /* GL_VOLATILE_APPLE */
+      1629, /* GL_RETAINED_APPLE */
+      2188, /* GL_UNDEFINED_APPLE */
+      1536, /* GL_PURGEABLE_APPLE */
        618, /* GL_FRAGMENT_SHADER */
-      2311, /* GL_VERTEX_SHADER */
-      1499, /* GL_PROGRAM_OBJECT_ARB */
-      1787, /* GL_SHADER_OBJECT_ARB */
+      2309, /* GL_VERTEX_SHADER */
+      1497, /* GL_PROGRAM_OBJECT_ARB */
+      1785, /* GL_SHADER_OBJECT_ARB */
       1069, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1160, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1151, /* GL_MAX_VARYING_COMPONENTS */
-      1158, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+      1159, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1150, /* GL_MAX_VARYING_COMPONENTS */
+      1157, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
       1051, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1285, /* GL_OBJECT_TYPE_ARB */
-      1789, /* GL_SHADER_TYPE */
+      1283, /* GL_OBJECT_TYPE_ARB */
+      1787, /* GL_SHADER_TYPE */
        583, /* GL_FLOAT_VEC2 */
        585, /* GL_FLOAT_VEC3 */
        587, /* GL_FLOAT_VEC4 */
@@ -5980,14 +5976,14 @@ static const unsigned reduced_enums[1571] =
        571, /* GL_FLOAT_MAT2 */
        575, /* GL_FLOAT_MAT3 */
        579, /* GL_FLOAT_MAT4 */
-      1725, /* GL_SAMPLER_1D */
-      1731, /* GL_SAMPLER_2D */
-      1739, /* GL_SAMPLER_3D */
-      1744, /* GL_SAMPLER_CUBE */
-      1730, /* GL_SAMPLER_1D_SHADOW */
-      1738, /* GL_SAMPLER_2D_SHADOW */
-      1736, /* GL_SAMPLER_2D_RECT */
-      1737, /* GL_SAMPLER_2D_RECT_SHADOW */
+      1723, /* GL_SAMPLER_1D */
+      1729, /* GL_SAMPLER_2D */
+      1737, /* GL_SAMPLER_3D */
+      1742, /* GL_SAMPLER_CUBE */
+      1728, /* GL_SAMPLER_1D_SHADOW */
+      1736, /* GL_SAMPLER_2D_SHADOW */
+      1734, /* GL_SAMPLER_2D_RECT */
+      1735, /* GL_SAMPLER_2D_RECT_SHADOW */
        573, /* GL_FLOAT_MAT2x3 */
        574, /* GL_FLOAT_MAT2x4 */
        577, /* GL_FLOAT_MAT3x2 */
@@ -5997,90 +5993,90 @@ static const unsigned reduced_enums[1571] =
        398, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
        871, /* GL_LINK_STATUS */
-      2256, /* GL_VALIDATE_STATUS */
+      2254, /* GL_VALIDATE_STATUS */
        768, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1788, /* GL_SHADER_SOURCE_LENGTH */
+      1786, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        620, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1791, /* GL_SHADING_LANGUAGE_VERSION */
+      1789, /* GL_SHADING_LANGUAGE_VERSION */
        375, /* GL_CURRENT_PROGRAM */
-      1334, /* GL_PALETTE4_RGB8_OES */
-      1336, /* GL_PALETTE4_RGBA8_OES */
-      1332, /* GL_PALETTE4_R5_G6_B5_OES */
-      1335, /* GL_PALETTE4_RGBA4_OES */
-      1333, /* GL_PALETTE4_RGB5_A1_OES */
-      1339, /* GL_PALETTE8_RGB8_OES */
-      1341, /* GL_PALETTE8_RGBA8_OES */
-      1337, /* GL_PALETTE8_R5_G6_B5_OES */
-      1340, /* GL_PALETTE8_RGBA4_OES */
-      1338, /* GL_PALETTE8_RGB5_A1_OES */
+      1332, /* GL_PALETTE4_RGB8_OES */
+      1334, /* GL_PALETTE4_RGBA8_OES */
+      1330, /* GL_PALETTE4_R5_G6_B5_OES */
+      1333, /* GL_PALETTE4_RGBA4_OES */
+      1331, /* GL_PALETTE4_RGB5_A1_OES */
+      1337, /* GL_PALETTE8_RGB8_OES */
+      1339, /* GL_PALETTE8_RGBA8_OES */
+      1335, /* GL_PALETTE8_R5_G6_B5_OES */
+      1338, /* GL_PALETTE8_RGBA4_OES */
+      1336, /* GL_PALETTE8_RGB5_A1_OES */
        749, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
        747, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1386, /* GL_POINT_SIZE_ARRAY_OES */
-      2059, /* GL_TEXTURE_CROP_RECT_OES */
+      1384, /* GL_POINT_SIZE_ARRAY_OES */
+      2057, /* GL_TEXTURE_CROP_RECT_OES */
       1023, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1385, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2239, /* GL_UNSIGNED_NORMALIZED */
-      1991, /* GL_TEXTURE_1D_ARRAY */
-      1524, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1994, /* GL_TEXTURE_2D_ARRAY */
-      1528, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      2002, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      2005, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1383, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2237, /* GL_UNSIGNED_NORMALIZED */
+      1989, /* GL_TEXTURE_1D_ARRAY */
+      1522, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      1992, /* GL_TEXTURE_2D_ARRAY */
+      1526, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      2000, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      2003, /* GL_TEXTURE_BINDING_2D_ARRAY */
       1076, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      2023, /* GL_TEXTURE_BUFFER */
-      1130, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      2009, /* GL_TEXTURE_BINDING_BUFFER */
-      2025, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      2027, /* GL_TEXTURE_BUFFER_FORMAT */
-      1561, /* GL_R11F_G11F_B10F */
-      2205, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1675, /* GL_RGB9_E5 */
-      2214, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2134, /* GL_TEXTURE_SHARED_SIZE */
-      1844, /* GL_SRGB */
-      1845, /* GL_SRGB8 */
-      1847, /* GL_SRGB_ALPHA */
-      1846, /* GL_SRGB8_ALPHA8 */
-      1804, /* GL_SLUMINANCE_ALPHA */
-      1803, /* GL_SLUMINANCE8_ALPHA8 */
-      1801, /* GL_SLUMINANCE */
-      1802, /* GL_SLUMINANCE8 */
+      2021, /* GL_TEXTURE_BUFFER */
+      1129, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+      2007, /* GL_TEXTURE_BINDING_BUFFER */
+      2023, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      2025, /* GL_TEXTURE_BUFFER_FORMAT */
+      1559, /* GL_R11F_G11F_B10F */
+      2203, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1673, /* GL_RGB9_E5 */
+      2212, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2132, /* GL_TEXTURE_SHARED_SIZE */
+      1842, /* GL_SRGB */
+      1843, /* GL_SRGB8 */
+      1845, /* GL_SRGB_ALPHA */
+      1844, /* GL_SRGB8_ALPHA8 */
+      1802, /* GL_SLUMINANCE_ALPHA */
+      1801, /* GL_SLUMINANCE8_ALPHA8 */
+      1799, /* GL_SLUMINANCE */
+      1800, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2169, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2158, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-      1149, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2167, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2163, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2161, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1468, /* GL_PRIMITIVES_GENERATED */
-      2165, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1565, /* GL_RASTERIZER_DISCARD */
-      1145, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-      1147, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+      2167, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2156, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      1148, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+      2165, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2161, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2159, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1466, /* GL_PRIMITIVES_GENERATED */
+      2163, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1563, /* GL_RASTERIZER_DISCARD */
+      1144, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+      1146, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
        787, /* GL_INTERLEAVED_ATTRIBS */
-      1780, /* GL_SEPARATE_ATTRIBS */
-      2153, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2155, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1404, /* GL_POINT_SPRITE_COORD_ORIGIN */
+      1778, /* GL_SEPARATE_ATTRIBS */
+      2151, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2153, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1402, /* GL_POINT_SPRITE_COORD_ORIGIN */
        880, /* GL_LOWER_LEFT */
-      2253, /* GL_UPPER_LEFT */
-      1868, /* GL_STENCIL_BACK_REF */
-      1869, /* GL_STENCIL_BACK_VALUE_MASK */
-      1870, /* GL_STENCIL_BACK_WRITEMASK */
+      2251, /* GL_UPPER_LEFT */
+      1866, /* GL_STENCIL_BACK_REF */
+      1867, /* GL_STENCIL_BACK_VALUE_MASK */
+      1868, /* GL_STENCIL_BACK_WRITEMASK */
        520, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1595, /* GL_RENDERBUFFER_BINDING */
-      1569, /* GL_READ_FRAMEBUFFER */
+      1593, /* GL_RENDERBUFFER_BINDING */
+      1567, /* GL_READ_FRAMEBUFFER */
        519, /* GL_DRAW_FRAMEBUFFER */
-      1570, /* GL_READ_FRAMEBUFFER_BINDING */
-      1614, /* GL_RENDERBUFFER_SAMPLES */
+      1568, /* GL_READ_FRAMEBUFFER_BINDING */
+      1612, /* GL_RENDERBUFFER_SAMPLES */
        634, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
        631, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
        646, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
@@ -6114,93 +6110,93 @@ static const unsigned reduced_enums[1571] =
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
        403, /* GL_DEPTH_ATTACHMENT */
-      1857, /* GL_STENCIL_ATTACHMENT */
+      1855, /* GL_STENCIL_ATTACHMENT */
        622, /* GL_FRAMEBUFFER */
-      1592, /* GL_RENDERBUFFER */
-      1618, /* GL_RENDERBUFFER_WIDTH */
-      1605, /* GL_RENDERBUFFER_HEIGHT */
-      1608, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1889, /* GL_STENCIL_INDEX_EXT */
-      1878, /* GL_STENCIL_INDEX1 */
-      1883, /* GL_STENCIL_INDEX4 */
-      1886, /* GL_STENCIL_INDEX8 */
-      1879, /* GL_STENCIL_INDEX16 */
-      1612, /* GL_RENDERBUFFER_RED_SIZE */
-      1603, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1598, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1593, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1600, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1616, /* GL_RENDERBUFFER_STENCIL_SIZE */
+      1590, /* GL_RENDERBUFFER */
+      1616, /* GL_RENDERBUFFER_WIDTH */
+      1603, /* GL_RENDERBUFFER_HEIGHT */
+      1606, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1887, /* GL_STENCIL_INDEX_EXT */
+      1876, /* GL_STENCIL_INDEX1 */
+      1881, /* GL_STENCIL_INDEX4 */
+      1884, /* GL_STENCIL_INDEX8 */
+      1877, /* GL_STENCIL_INDEX16 */
+      1610, /* GL_RENDERBUFFER_RED_SIZE */
+      1601, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1596, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1591, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1598, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1614, /* GL_RENDERBUFFER_STENCIL_SIZE */
        675, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-      1125, /* GL_MAX_SAMPLES */
-      2096, /* GL_TEXTURE_GEN_STR_OES */
+      1124, /* GL_MAX_SAMPLES */
+      2094, /* GL_TEXTURE_GEN_STR_OES */
        723, /* GL_HALF_FLOAT_OES */
-      1661, /* GL_RGB565 */
+      1659, /* GL_RGB565 */
        547, /* GL_ETC1_RGB8_OES */
-      2088, /* GL_TEXTURE_EXTERNAL_OES */
-      1747, /* GL_SAMPLER_EXTERNAL_OES */
-      2014, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-      1627, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-      1692, /* GL_RGBA32UI */
-      1655, /* GL_RGB32UI */
+      2086, /* GL_TEXTURE_EXTERNAL_OES */
+      1745, /* GL_SAMPLER_EXTERNAL_OES */
+      2012, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+      1625, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+      1690, /* GL_RGBA32UI */
+      1653, /* GL_RGB32UI */
         40, /* GL_ALPHA32UI_EXT */
        779, /* GL_INTENSITY32UI_EXT */
        897, /* GL_LUMINANCE32UI_EXT */
        914, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1683, /* GL_RGBA16UI */
-      1647, /* GL_RGB16UI */
+      1681, /* GL_RGBA16UI */
+      1645, /* GL_RGB16UI */
         37, /* GL_ALPHA16UI_EXT */
        776, /* GL_INTENSITY16UI_EXT */
        892, /* GL_LUMINANCE16UI_EXT */
        912, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1702, /* GL_RGBA8UI */
-      1670, /* GL_RGB8UI */
+      1700, /* GL_RGBA8UI */
+      1668, /* GL_RGB8UI */
         45, /* GL_ALPHA8UI_EXT */
        784, /* GL_INTENSITY8UI_EXT */
        906, /* GL_LUMINANCE8UI_EXT */
        916, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1690, /* GL_RGBA32I */
-      1653, /* GL_RGB32I */
+      1688, /* GL_RGBA32I */
+      1651, /* GL_RGB32I */
         39, /* GL_ALPHA32I_EXT */
        778, /* GL_INTENSITY32I_EXT */
        896, /* GL_LUMINANCE32I_EXT */
        913, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1681, /* GL_RGBA16I */
-      1645, /* GL_RGB16I */
+      1679, /* GL_RGBA16I */
+      1643, /* GL_RGB16I */
         36, /* GL_ALPHA16I_EXT */
        775, /* GL_INTENSITY16I_EXT */
        891, /* GL_LUMINANCE16I_EXT */
        911, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1700, /* GL_RGBA8I */
-      1668, /* GL_RGB8I */
+      1698, /* GL_RGBA8I */
+      1666, /* GL_RGB8I */
         44, /* GL_ALPHA8I_EXT */
        783, /* GL_INTENSITY8I_EXT */
        905, /* GL_LUMINANCE8I_EXT */
        915, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1582, /* GL_RED_INTEGER */
+      1580, /* GL_RED_INTEGER */
        718, /* GL_GREEN_INTEGER */
        113, /* GL_BLUE_INTEGER */
         49, /* GL_ALPHA_INTEGER_EXT */
-      1715, /* GL_RGB_INTEGER */
-      1709, /* GL_RGBA_INTEGER */
+      1713, /* GL_RGB_INTEGER */
+      1707, /* GL_RGBA_INTEGER */
         84, /* GL_BGR_INTEGER */
         82, /* GL_BGRA_INTEGER */
        918, /* GL_LUMINANCE_INTEGER_EXT */
        917, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1711, /* GL_RGBA_INTEGER_MODE_EXT */
+      1709, /* GL_RGBA_INTEGER_MODE_EXT */
        793, /* GL_INT_2_10_10_10_REV */
        629, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
        670, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
        669, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1726, /* GL_SAMPLER_1D_ARRAY */
-      1732, /* GL_SAMPLER_2D_ARRAY */
-      1742, /* GL_SAMPLER_BUFFER */
-      1728, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1734, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1745, /* GL_SAMPLER_CUBE_SHADOW */
-      2233, /* GL_UNSIGNED_INT_VEC2 */
-      2235, /* GL_UNSIGNED_INT_VEC3 */
-      2237, /* GL_UNSIGNED_INT_VEC4 */
+      1724, /* GL_SAMPLER_1D_ARRAY */
+      1730, /* GL_SAMPLER_2D_ARRAY */
+      1740, /* GL_SAMPLER_BUFFER */
+      1726, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1732, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1743, /* GL_SAMPLER_CUBE_SHADOW */
+      2231, /* GL_UNSIGNED_INT_VEC2 */
+      2233, /* GL_UNSIGNED_INT_VEC3 */
+      2235, /* GL_UNSIGNED_INT_VEC4 */
        794, /* GL_INT_SAMPLER_1D */
        798, /* GL_INT_SAMPLER_2D */
        804, /* GL_INT_SAMPLER_3D */
@@ -6209,96 +6205,96 @@ static const unsigned reduced_enums[1571] =
        795, /* GL_INT_SAMPLER_1D_ARRAY */
        799, /* GL_INT_SAMPLER_2D_ARRAY */
        806, /* GL_INT_SAMPLER_BUFFER */
-      2217, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2221, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2227, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2231, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2225, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2218, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2222, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2229, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+      2215, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2219, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2225, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2229, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2223, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2216, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2220, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2227, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
        708, /* GL_GEOMETRY_SHADER */
        711, /* GL_GEOMETRY_VERTICES_OUT_ARB */
        705, /* GL_GEOMETRY_INPUT_TYPE_ARB */
        707, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
       1082, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1165, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+      1164, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
       1080, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
       1074, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
       1078, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
        881, /* GL_LOW_FLOAT */
-      1167, /* GL_MEDIUM_FLOAT */
+      1166, /* GL_MEDIUM_FLOAT */
        724, /* GL_HIGH_FLOAT */
        882, /* GL_LOW_INT */
-      1168, /* GL_MEDIUM_INT */
+      1167, /* GL_MEDIUM_INT */
        725, /* GL_HIGH_INT */
-      2207, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+      2205, /* GL_UNSIGNED_INT_10_10_10_2_OES */
        792, /* GL_INT_10_10_10_2_OES */
-      1785, /* GL_SHADER_BINARY_FORMATS */
-      1270, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1786, /* GL_SHADER_COMPILER */
-      1162, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1154, /* GL_MAX_VARYING_VECTORS */
+      1783, /* GL_SHADER_BINARY_FORMATS */
+      1268, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1784, /* GL_SHADER_COMPILER */
+      1161, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1153, /* GL_MAX_VARYING_VECTORS */
       1071, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1558, /* GL_QUERY_WAIT */
-      1552, /* GL_QUERY_NO_WAIT */
-      1548, /* GL_QUERY_BY_REGION_WAIT */
-      1546, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2151, /* GL_TRANSFORM_FEEDBACK */
-      2160, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2154, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2152, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1542, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+      1556, /* GL_QUERY_WAIT */
+      1550, /* GL_QUERY_NO_WAIT */
+      1546, /* GL_QUERY_BY_REGION_WAIT */
+      1544, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2149, /* GL_TRANSFORM_FEEDBACK */
+      2158, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2152, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2150, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1540, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
        563, /* GL_FIRST_VERTEX_CONVENTION */
        826, /* GL_LAST_VERTEX_CONVENTION */
-      1516, /* GL_PROVOKING_VERTEX */
+      1514, /* GL_PROVOKING_VERTEX */
        354, /* GL_COPY_READ_BUFFER */
        355, /* GL_COPY_WRITE_BUFFER */
-      1585, /* GL_RED_SNORM */
-      1722, /* GL_RG_SNORM */
-      1721, /* GL_RGB_SNORM */
-      1714, /* GL_RGBA_SNORM */
-      1564, /* GL_R8_SNORM */
-      1634, /* GL_RG8_SNORM */
-      1674, /* GL_RGB8_SNORM */
-      1706, /* GL_RGBA8_SNORM */
-      1562, /* GL_R16_SNORM */
-      1633, /* GL_RG16_SNORM */
-      1650, /* GL_RGB16_SNORM */
-      1686, /* GL_RGBA16_SNORM */
-      1797, /* GL_SIGNED_NORMALIZED */
-      1470, /* GL_PRIMITIVE_RESTART */
-      1471, /* GL_PRIMITIVE_RESTART_INDEX */
-      1638, /* GL_RGB10_A2UI */
-      1127, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1284, /* GL_OBJECT_TYPE */
-      1910, /* GL_SYNC_CONDITION */
-      1915, /* GL_SYNC_STATUS */
-      1912, /* GL_SYNC_FLAGS */
-      1911, /* GL_SYNC_FENCE */
-      1914, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2200, /* GL_UNSIGNALED */
-      1796, /* GL_SIGNALED */
+      1583, /* GL_RED_SNORM */
+      1720, /* GL_RG_SNORM */
+      1719, /* GL_RGB_SNORM */
+      1712, /* GL_RGBA_SNORM */
+      1562, /* GL_R8_SNORM */
+      1632, /* GL_RG8_SNORM */
+      1672, /* GL_RGB8_SNORM */
+      1704, /* GL_RGBA8_SNORM */
+      1560, /* GL_R16_SNORM */
+      1631, /* GL_RG16_SNORM */
+      1648, /* GL_RGB16_SNORM */
+      1684, /* GL_RGBA16_SNORM */
+      1795, /* GL_SIGNED_NORMALIZED */
+      1468, /* GL_PRIMITIVE_RESTART */
+      1469, /* GL_PRIMITIVE_RESTART_INDEX */
+      1636, /* GL_RGB10_A2UI */
+      1126, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1282, /* GL_OBJECT_TYPE */
+      1908, /* GL_SYNC_CONDITION */
+      1913, /* GL_SYNC_STATUS */
+      1910, /* GL_SYNC_FLAGS */
+      1909, /* GL_SYNC_FENCE */
+      1912, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2198, /* GL_UNSIGNALED */
+      1794, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2146, /* GL_TIMEOUT_EXPIRED */
+      2144, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2317, /* GL_WAIT_FAILED */
+      2315, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
-      1157, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+      1156, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
       1072, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
       1073, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
       1068, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
        330, /* GL_CONTEXT_PROFILE_MASK */
        713, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
        548, /* GL_EVAL_BIT */
-      1567, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+      1565, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        873, /* GL_LIST_BIT */
-      2018, /* GL_TEXTURE_BIT */
-      1766, /* GL_SCISSOR_BIT */
+      2016, /* GL_TEXTURE_BIT */
+      1764, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
-      1233, /* GL_MULTISAMPLE_BIT */
+      1231, /* 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 9111caa1b..611a6d0b0 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -2669,8 +2669,10 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
    }
 
    if (mask & GL_STENCIL_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = readFb->_StencilBuffer;
-      struct gl_renderbuffer *drawRb = drawFb->_StencilBuffer;
+      struct gl_renderbuffer *readRb =
+         readFb->Attachment[BUFFER_STENCIL].Renderbuffer;
+      struct gl_renderbuffer *drawRb =
+         drawFb->Attachment[BUFFER_STENCIL].Renderbuffer;
 
       /* From the EXT_framebuffer_object spec:
        *
@@ -2679,7 +2681,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
        *     ignored."
        */
       if ((readRb == NULL) || (drawRb == NULL)) {
-	 readRb = drawRb = NULL;
 	 mask &= ~GL_STENCIL_BUFFER_BIT;
       }
       else if (_mesa_get_format_bits(readRb->Format, GL_STENCIL_BITS) !=
@@ -2691,8 +2692,10 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
    }
 
    if (mask & GL_DEPTH_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = readFb->_DepthBuffer;
-      struct gl_renderbuffer *drawRb = drawFb->_DepthBuffer;
+      struct gl_renderbuffer *readRb =
+         readFb->Attachment[BUFFER_DEPTH].Renderbuffer;
+      struct gl_renderbuffer *drawRb =
+         drawFb->Attachment[BUFFER_DEPTH].Renderbuffer;
 
       /* From the EXT_framebuffer_object spec:
        *
@@ -2701,7 +2704,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
        *     ignored."
        */
       if ((readRb == NULL) || (drawRb == NULL)) {
-	 readRb = drawRb = NULL;
 	 mask &= ~GL_DEPTH_BUFFER_BIT;
       }
       else if (_mesa_get_format_bits(readRb->Format, GL_DEPTH_BITS) !=
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index e30f31a39..6d5e4524a 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -34,7 +34,6 @@
 #include "imports.h"
 #include "buffers.h"
 #include "context.h"
-#include "depthstencil.h"
 #include "enums.h"
 #include "formats.h"
 #include "macros.h"
@@ -307,24 +306,6 @@ _mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
       }
    }
 
-   if (fb->_DepthBuffer) {
-      struct gl_renderbuffer *rb = fb->_DepthBuffer;
-      if (rb->Width != width || rb->Height != height) {
-         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-         }
-      }
-   }
-
-   if (fb->_StencilBuffer) {
-      struct gl_renderbuffer *rb = fb->_StencilBuffer;
-      if (rb->Width != width || rb->Height != height) {
-         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-         }
-      }
-   }
-
    fb->Width = width;
    fb->Height = height;
 
@@ -600,80 +581,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
 }
 
 
-/**
- * Update the framebuffer's _DepthBuffer field using the renderbuffer
- * found at the given attachment index.
- *
- * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
- * create and install a depth wrapper/adaptor.
- *
- * \param fb  the framebuffer whose _DepthBuffer field to update
- */
-static void
-update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
-{
-   struct gl_renderbuffer *depthRb =
-      fb->Attachment[BUFFER_DEPTH].Renderbuffer;
-
-   if (depthRb && _mesa_is_format_packed_depth_stencil(depthRb->Format)) {
-      /* The attached depth buffer is a GL_DEPTH_STENCIL renderbuffer */
-      if (!fb->_DepthBuffer
-          || fb->_DepthBuffer->Wrapped != depthRb
-          || _mesa_get_format_base_format(fb->_DepthBuffer->Format) != GL_DEPTH_COMPONENT) {
-         /* need to update wrapper */
-         struct gl_renderbuffer *wrapper;
-
-         if (depthRb->Format == MESA_FORMAT_Z32_FLOAT_X24S8) {
-            wrapper = _mesa_new_z32f_renderbuffer_wrapper(ctx, depthRb);
-         }
-         else {
-            wrapper = _mesa_new_z24_renderbuffer_wrapper(ctx, depthRb);
-         }
-         _mesa_reference_renderbuffer(&fb->_DepthBuffer, wrapper);
-         ASSERT(fb->_DepthBuffer->Wrapped == depthRb);
-      }
-   }
-   else {
-      /* depthRb may be null */
-      _mesa_reference_renderbuffer(&fb->_DepthBuffer, depthRb);
-   }
-}
-
-
-/**
- * Update the framebuffer's _StencilBuffer field using the renderbuffer
- * found at the given attachment index.
- *
- * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
- * create and install a stencil wrapper/adaptor.
- *
- * \param fb  the framebuffer whose _StencilBuffer field to update
- */
-static void
-update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
-{
-   struct gl_renderbuffer *stencilRb =
-      fb->Attachment[BUFFER_STENCIL].Renderbuffer;
-
-   if (stencilRb && _mesa_is_format_packed_depth_stencil(stencilRb->Format)) {
-      /* The attached stencil buffer is a GL_DEPTH_STENCIL renderbuffer */
-      if (!fb->_StencilBuffer
-          || fb->_StencilBuffer->Wrapped != stencilRb
-          || _mesa_get_format_base_format(fb->_StencilBuffer->Format) != GL_STENCIL_INDEX) {
-         /* need to update wrapper */
-         struct gl_renderbuffer *wrapper
-            = _mesa_new_s8_renderbuffer_wrapper(ctx, stencilRb);
-         _mesa_reference_renderbuffer(&fb->_StencilBuffer, wrapper);
-         ASSERT(fb->_StencilBuffer->Wrapped == stencilRb);
-      }
-   }
-   else {
-      /* stencilRb may be null */
-      _mesa_reference_renderbuffer(&fb->_StencilBuffer, stencilRb);
-   }
-}
-
-
 /*
  * Example DrawBuffers scenarios:
  *
@@ -812,8 +719,6 @@ update_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
     */
    update_color_draw_buffers(ctx, fb);
    update_color_read_buffer(ctx, fb);
-   update_depth_buffer(ctx, fb);
-   update_stencil_buffer(ctx, fb);
 
    compute_depth_max(fb);
 }
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index fc494f748..193434976 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2650,8 +2650,9 @@ struct gl_framebuffer
    struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS];
    struct gl_renderbuffer *_ColorReadBuffer;
 
-   /** The Actual depth/stencil buffers to use.  May be wrappers around the
-    * depth/stencil buffers attached above. */
+   /** Wrappers to make combined depth/stencil buffers look like separate
+    * buffers.  Only used by swrast.  Will be removed in the future.
+    */
    struct gl_renderbuffer *_DepthBuffer;
    struct gl_renderbuffer *_StencilBuffer;
 
@@ -2829,6 +2830,15 @@ struct gl_constants
     * Texture borders are deprecated in GL 3.0.
     **/
    GLboolean StripTextureBorder;
+
+   /**
+    * For drivers which can do a better job at eliminating unused varyings
+    * and uniforms than the GLSL compiler.
+    *
+    * XXX Remove these as soon as a better solution is available.
+    */
+   GLboolean GLSLSkipStrictMaxVaryingLimitCheck;
+   GLboolean GLSLSkipStrictMaxUniformLimitCheck;
 };
 
 
diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index e9bf3aadf..b4d142fa9 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -112,6 +112,7 @@ arb_input_attrib_string(GLint index, GLenum progType)
       "vertex.texcoord[5]",
       "vertex.texcoord[6]",
       "vertex.texcoord[7]",
+      "vertex.pointsize",
       "vertex.attrib[0]",
       "vertex.attrib[1]",
       "vertex.attrib[2]",
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index a3ce85535..09cdd261b 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -27,7 +27,6 @@ MAIN_SOURCES = \
 	main/cpuinfo.c \
 	main/debug.c \
 	main/depth.c \
-	main/depthstencil.c \
 	main/dlist.c \
 	main/dlopen.c \
 	main/drawpix.c \
@@ -134,6 +133,7 @@ SWRAST_SOURCES = \
 	swrast/s_copypix.c \
 	swrast/s_context.c \
 	swrast/s_depth.c \
+	swrast/s_depthstencil.c \
 	swrast/s_drawpix.c \
 	swrast/s_feedback.c \
 	swrast/s_fog.c \
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 912241b35..65b444552 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1182,12 +1182,9 @@ copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
       return;
    }
 
-   /* Get the dest renderbuffer.  If there's a wrapper, use the
-    * underlying renderbuffer.
-    */
-   rbDraw = st_renderbuffer(ctx->DrawBuffer->_StencilBuffer);
-   if (rbDraw->Base.Wrapped)
-      rbDraw = st_renderbuffer(rbDraw->Base.Wrapped);
+   /* Get the dest renderbuffer */
+   rbDraw = st_renderbuffer(ctx->DrawBuffer->
+                            Attachment[BUFFER_STENCIL].Renderbuffer);
 
    /* this will do stencil pixel transfer ops */
    _mesa_readpixels(ctx, srcx, srcy, width, height,
@@ -1484,7 +1481,8 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
    }
    else {
       assert(type == GL_DEPTH);
-      rbRead = st_renderbuffer(ctx->ReadBuffer->_DepthBuffer);
+      rbRead = st_renderbuffer(ctx->ReadBuffer->
+                               Attachment[BUFFER_DEPTH].Renderbuffer);
       color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
 
       fpv = get_depth_stencil_fp_variant(st, GL_TRUE, GL_FALSE);
@@ -1496,10 +1494,6 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
    /* update fragment program constants */
    st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);
 
-
-   if (rbRead->Base.Wrapped)
-      rbRead = st_renderbuffer(rbRead->Base.Wrapped);
-
    sample_count = rbRead->texture->nr_samples;
    /* I believe this would be legal, presumably would need to do a resolve
       for color, and for depth/stencil spec says to just use one of the
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 52f654d7d..289ad5114 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1385,10 +1385,7 @@ st_copy_texsubimage(struct gl_context *ctx,
    /* determine if copying depth or color data */
    if (texBaseFormat == GL_DEPTH_COMPONENT ||
        texBaseFormat == GL_DEPTH_STENCIL) {
-      strb = st_renderbuffer(fb->_DepthBuffer);
-      if (strb->Base.Wrapped) {
-         strb = st_renderbuffer(strb->Base.Wrapped);
-      }
+      strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
    }
    else {
       /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 9e39729e9..457d5d62a 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -222,6 +222,12 @@ void st_init_limits(struct st_context *st)
    c->UniformBooleanTrue = ~0;
 
    c->StripTextureBorder = GL_TRUE;
+
+   c->GLSLSkipStrictMaxUniformLimitCheck =
+      screen->get_param(screen, PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS);
+
+   c->GLSLSkipStrictMaxVaryingLimitCheck =
+      screen->get_param(screen, PIPE_CAP_TGSI_CAN_COMPACT_VARYINGS);
 }
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 6cc655d70..9ef65c8fd 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1807,27 +1807,27 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
       }
    case ir_binop_lshift:
       if (native_integers) {
-         emit(ir, TGSI_OPCODE_SHL, result_dst, op[0]);
+         emit(ir, TGSI_OPCODE_SHL, result_dst, op[0], op[1]);
          break;
       }
    case ir_binop_rshift:
       if (native_integers) {
-         emit(ir, TGSI_OPCODE_ISHR, result_dst, op[0]);
+         emit(ir, TGSI_OPCODE_ISHR, result_dst, op[0], op[1]);
          break;
       }
    case ir_binop_bit_and:
       if (native_integers) {
-         emit(ir, TGSI_OPCODE_AND, result_dst, op[0]);
+         emit(ir, TGSI_OPCODE_AND, result_dst, op[0], op[1]);
          break;
       }
    case ir_binop_bit_xor:
       if (native_integers) {
-         emit(ir, TGSI_OPCODE_XOR, result_dst, op[0]);
+         emit(ir, TGSI_OPCODE_XOR, result_dst, op[0], op[1]);
          break;
       }
    case ir_binop_bit_or:
       if (native_integers) {
-         emit(ir, TGSI_OPCODE_OR, result_dst, op[0]);
+         emit(ir, TGSI_OPCODE_OR, result_dst, op[0], op[1]);
          break;
       }
    case ir_unop_round_even:
@@ -3515,8 +3515,8 @@ glsl_to_tgsi_visitor::eliminate_dead_code_advanced(void)
 
       case TGSI_OPCODE_ENDIF:
       case TGSI_OPCODE_ELSE:
-         /* Promote the recorded level all channels written inside the preceding
-          * if or else block to the level above the if/else block.
+         /* Promote the recorded level of all channels written inside the
+          * preceding if or else block to the level above the if/else block.
           */
          for (int r = 0; r < this->next_temp; r++) {
             for (int c = 0; c < 4; c++) {
diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index f094be898..2817ec12f 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -573,6 +573,9 @@ _swrast_BlitFramebuffer(struct gl_context *ctx,
       return;
    }
 
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived(ctx);
+
    swrast_render_start(ctx);
 
    if (srcX1 - srcX0 == dstX1 - dstX0 &&
diff --git a/mesalib/src/mesa/swrast/s_clear.c b/mesalib/src/mesa/swrast/s_clear.c
index 615747d69..851f6d165 100644
--- a/mesalib/src/mesa/swrast/s_clear.c
+++ b/mesalib/src/mesa/swrast/s_clear.c
@@ -213,6 +213,9 @@ _swrast_Clear(struct gl_context *ctx, GLbitfield buffers)
    if (!_mesa_check_conditional_render(ctx))
       return; /* don't clear */
 
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived(ctx);
+
    swrast_render_start(ctx);
 
    /* do software clearing here */
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index 924612578..6850a09f3 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -36,6 +36,7 @@
 #include "swrast.h"
 #include "s_blend.h"
 #include "s_context.h"
+#include "s_depthstencil.h"
 #include "s_lines.h"
 #include "s_points.h"
 #include "s_span.h"
@@ -545,6 +546,25 @@ _swrast_update_active_attribs(struct gl_context *ctx)
 }
 
 
+/**
+ * Update the depth/stencil renderbuffers, if needed.
+ */
+static void
+_swrast_update_depth_stencil(struct gl_context *ctx)
+{
+   struct gl_framebuffer *drawFb = ctx->DrawBuffer;
+   struct gl_framebuffer *readFb = ctx->ReadBuffer;
+
+   _swrast_update_depth_buffer(ctx, drawFb);
+   _swrast_update_stencil_buffer(ctx, drawFb);
+
+   if (readFb != drawFb) {
+      _swrast_update_depth_buffer(ctx, readFb);
+      _swrast_update_stencil_buffer(ctx, readFb);
+   }
+}
+
+
 void
 _swrast_validate_derived( struct gl_context *ctx )
 {
@@ -589,6 +609,9 @@ _swrast_validate_derived( struct gl_context *ctx )
                               _NEW_TEXTURE))
          _swrast_update_specular_vertex_add(ctx);
 
+      if (swrast->NewState & _NEW_BUFFERS)
+         _swrast_update_depth_stencil(ctx);
+
       swrast->NewState = 0;
       swrast->StateChanges = 0;
       swrast->InvalidateState = _swrast_invalidate_state;
diff --git a/mesalib/src/mesa/main/depthstencil.c b/mesalib/src/mesa/swrast/s_depthstencil.c
index af5c12f67..dc768e216 100644
--- a/mesalib/src/mesa/main/depthstencil.c
+++ b/mesalib/src/mesa/swrast/s_depthstencil.c
@@ -22,13 +22,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "formats.h"
-#include "mtypes.h"
-#include "depthstencil.h"
-#include "renderbuffer.h"
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "main/context.h"
+#include "main/formats.h"
+#include "main/mtypes.h"
+#include "main/renderbuffer.h"
+#include "swrast/s_depthstencil.h"
 
 
 /**
@@ -349,9 +349,9 @@ put_mono_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb,
  * a depth renderbuffer.
  * \return new depth renderbuffer
  */
-struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
-                                   struct gl_renderbuffer *dsrb)
+static struct gl_renderbuffer *
+new_z24_renderbuffer_wrapper(struct gl_context *ctx,
+                             struct gl_renderbuffer *dsrb)
 {
    struct gl_renderbuffer *z24rb;
 
@@ -563,9 +563,9 @@ put_mono_values_z32f(struct gl_context *ctx, struct gl_renderbuffer *z32frb,
  * a depth renderbuffer.
  * \return new depth renderbuffer
  */
-struct gl_renderbuffer *
-_mesa_new_z32f_renderbuffer_wrapper(struct gl_context *ctx,
-                                    struct gl_renderbuffer *dsrb)
+static struct gl_renderbuffer *
+new_z32f_renderbuffer_wrapper(struct gl_context *ctx,
+                              struct gl_renderbuffer *dsrb)
 {
    struct gl_renderbuffer *z32frb;
 
@@ -915,8 +915,8 @@ put_mono_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint
  * a stencil renderbuffer.
  * \return new stencil renderbuffer
  */
-struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx, struct gl_renderbuffer *dsrb)
+static struct gl_renderbuffer *
+new_s8_renderbuffer_wrapper(struct gl_context *ctx, struct gl_renderbuffer *dsrb)
 {
    struct gl_renderbuffer *s8rb;
 
@@ -957,3 +957,81 @@ _mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx, struct gl_renderbuffer
 
    return s8rb;
 }
+
+
+/**
+ * Update the framebuffer's _DepthBuffer field using the renderbuffer
+ * found at the given attachment index.
+ *
+ * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
+ * create and install a depth wrapper/adaptor.
+ *
+ * \param fb  the framebuffer whose _DepthBuffer field to update
+ */
+void
+_swrast_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
+{
+   struct gl_renderbuffer *depthRb =
+      fb->Attachment[BUFFER_DEPTH].Renderbuffer;
+
+   if (depthRb && _mesa_is_format_packed_depth_stencil(depthRb->Format)) {
+      /* The attached depth buffer is a GL_DEPTH_STENCIL renderbuffer */
+      if (!fb->_DepthBuffer
+          || fb->_DepthBuffer->Wrapped != depthRb
+          || _mesa_get_format_base_format(fb->_DepthBuffer->Format) != GL_DEPTH_COMPONENT) {
+         /* need to update wrapper */
+         struct gl_renderbuffer *wrapper;
+
+         if (depthRb->Format == MESA_FORMAT_Z32_FLOAT_X24S8) {
+            wrapper = new_z32f_renderbuffer_wrapper(ctx, depthRb);
+         }
+         else {
+            wrapper = new_z24_renderbuffer_wrapper(ctx, depthRb);
+         }
+         _mesa_reference_renderbuffer(&fb->_DepthBuffer, wrapper);
+      }
+      ASSERT(fb->_DepthBuffer->Wrapped == depthRb);
+      fb->_DepthBuffer->Width = depthRb->Width;
+      fb->_DepthBuffer->Height = depthRb->Height;
+   }
+   else {
+      /* depthRb may be null */
+      _mesa_reference_renderbuffer(&fb->_DepthBuffer, depthRb);
+   }
+}
+
+
+/**
+ * Update the framebuffer's _StencilBuffer field using the renderbuffer
+ * found at the given attachment index.
+ *
+ * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
+ * create and install a stencil wrapper/adaptor.
+ *
+ * \param fb  the framebuffer whose _StencilBuffer field to update
+ */
+void
+_swrast_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
+{
+   struct gl_renderbuffer *stencilRb =
+      fb->Attachment[BUFFER_STENCIL].Renderbuffer;
+
+   if (stencilRb && _mesa_is_format_packed_depth_stencil(stencilRb->Format)) {
+      /* The attached stencil buffer is a GL_DEPTH_STENCIL renderbuffer */
+      if (!fb->_StencilBuffer
+          || fb->_StencilBuffer->Wrapped != stencilRb
+          || _mesa_get_format_base_format(fb->_StencilBuffer->Format) != GL_STENCIL_INDEX) {
+         /* need to update wrapper */
+         struct gl_renderbuffer *wrapper
+            = new_s8_renderbuffer_wrapper(ctx, stencilRb);
+         _mesa_reference_renderbuffer(&fb->_StencilBuffer, wrapper);
+      }
+      ASSERT(fb->_StencilBuffer->Wrapped == stencilRb);
+      fb->_StencilBuffer->Width = stencilRb->Width;
+      fb->_StencilBuffer->Height = stencilRb->Height;
+   }
+   else {
+      /* stencilRb may be null */
+      _mesa_reference_renderbuffer(&fb->_StencilBuffer, stencilRb);
+   }
+}
diff --git a/mesalib/src/mesa/main/depthstencil.h b/mesalib/src/mesa/swrast/s_depthstencil.h
index c3871d805..0bf624a7b 100644
--- a/mesalib/src/mesa/main/depthstencil.h
+++ b/mesalib/src/mesa/swrast/s_depthstencil.h
@@ -23,24 +23,17 @@
  */
 
 
-#ifndef DEPTHSTENCIL_H
-#define DEPTHSTENCIL_H
+#ifndef S_DEPTHSTENCIL_H
+#define S_DEPTHSTENCIL_H
 
 struct gl_context;
+struct gl_framebuffer;
 
-extern struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
-                                   struct gl_renderbuffer *dsrb);
+void
+_swrast_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb);
 
+void
+_swrast_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb);
 
-extern struct gl_renderbuffer *
-_mesa_new_z32f_renderbuffer_wrapper(struct gl_context *ctx,
-                                    struct gl_renderbuffer *dsrb);
 
-
-extern struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,
-                                  struct gl_renderbuffer *dsrb);
-
-
-#endif /* DEPTHSTENCIL_H */
+#endif /* S_DEPTHSTENCIL_H */
diff --git a/mesalib/src/mesa/swrast/s_renderbuffer.c b/mesalib/src/mesa/swrast/s_renderbuffer.c
index 7622e38fd..bb7cdebfe 100644
--- a/mesalib/src/mesa/swrast/s_renderbuffer.c
+++ b/mesalib/src/mesa/swrast/s_renderbuffer.c
@@ -1888,6 +1888,31 @@ add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
 }
 
 
+static GLboolean
+add_depth_stencil_renderbuffer(struct gl_context *ctx,
+                               struct gl_framebuffer *fb)
+{
+   struct gl_renderbuffer *rb;
+
+   assert(fb->Attachment[BUFFER_DEPTH].Renderbuffer == NULL);
+   assert(fb->Attachment[BUFFER_STENCIL].Renderbuffer == NULL);
+
+   rb = _mesa_new_renderbuffer(ctx, 0);
+   if (!rb) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating depth+stencil buffer");
+      return GL_FALSE;
+   }
+
+   rb->InternalFormat = GL_DEPTH_STENCIL;
+
+   rb->AllocStorage = soft_renderbuffer_storage;
+   _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+   _mesa_add_renderbuffer(fb, BUFFER_STENCIL, rb);
+
+   return GL_TRUE;
+}
+
+
 /**
  * Add a software-based accumulation renderbuffer to the given framebuffer.
  * This is a helper routine for device drivers when creating a
@@ -1999,14 +2024,29 @@ _swrast_add_soft_renderbuffers(struct gl_framebuffer *fb,
                               frontRight, backRight);
    }
 
-   if (depth) {
-      assert(fb->Visual.depthBits > 0);
-      add_depth_renderbuffer(NULL, fb, fb->Visual.depthBits);
-   }
+#if 0
+   /* This is pretty much for debugging purposes only since there's a perf
+    * hit for using combined depth/stencil in swrast.
+    */
+   if (depth && fb->Visual.depthBits == 24 &&
+       stencil && fb->Visual.stencilBits == 8) {
+      /* use combined depth/stencil buffer */
+      add_depth_stencil_renderbuffer(NULL, fb);
+   }
+   else
+#else
+   (void) add_depth_stencil_renderbuffer;
+#endif
+   {
+      if (depth) {
+         assert(fb->Visual.depthBits > 0);
+         add_depth_renderbuffer(NULL, fb, fb->Visual.depthBits);
+      }
 
-   if (stencil) {
-      assert(fb->Visual.stencilBits > 0);
-      add_stencil_renderbuffer(NULL, fb, fb->Visual.stencilBits);
+      if (stencil) {
+         assert(fb->Visual.stencilBits > 0);
+         add_stencil_renderbuffer(NULL, fb, fb->Visual.stencilBits);
+      }
    }
 
    if (accum) {