Merge branch 'arb_sampler_objects'

76 files changed, 10603 insertions, 7942 deletions

diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml
new file mode 100644
index 00000000000..0d39db4d33f
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+<OpenGLAPI>
+
+<category name="GL_ARB_sampler_objects" number="81">
+
+    <function name="GenSamplers" offset="assign">
+      <param name="count" type="GLsizei"/>
+      <param name="samplers" type="GLuint *"/>
+    </function>
+
+    <function name="DeleteSamplers" offset="assign">
+      <param name="count" type="GLsizei"/>
+      <param name="samplers" type="const GLuint *"/>
+    </function>
+
+    <function name="IsSampler" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <return type="GLboolean"/>
+    </function>
+
+    <function name="BindSampler" offset="assign">
+      <param name="unit" type="GLuint"/>
+      <param name="sampler" type="GLuint"/>
+    </function>
+
+    <function name="SamplerParameteri" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="GLint"/>
+    </function>
+
+    <function name="SamplerParameterf" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="param" type="GLfloat"/>
+    </function>
+
+    <function name="SamplerParameteriv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="const GLint *"/>
+    </function>
+
+    <function name="SamplerParameterfv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="const GLfloat *"/>
+    </function>
+
+    <function name="SamplerParameterIiv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="const GLint *"/>
+    </function>
+
+    <function name="SamplerParameterIuiv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="const GLuint *"/>
+    </function>
+
+    <function name="GetSamplerParameteriv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="GLint *"/>
+    </function>
+
+    <function name="GetSamplerParameterfv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="GLfloat *"/>
+    </function>
+
+    <function name="GetSamplerParameterIiv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="GLint *"/>
+    </function>
+
+    <function name="GetSamplerParameterIuiv" offset="assign">
+      <param name="sampler" type="GLuint"/>
+      <param name="pname" type="GLenum"/>
+      <param name="params" type="GLuint *"/>
+    </function>
+
+    <enum name="SAMPLER_BINDING" count="1"  value="0x8919">
+        <size name="Get" mode="get"/>
+    </enum>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index f9aae84d194..b56ce863992 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -80,6 +80,7 @@ API_XML = \
 	ARB_geometry_shader4.xml \
 	ARB_instanced_arrays.xml \
 	ARB_map_buffer_range.xml \
+	ARB_sampler_objects.xml \
 	ARB_seamless_cube_map.xml \
 	ARB_sync.xml \
 	ARB_texture_buffer_object.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index fe44a834f96..ef68ad62cf7 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -7973,6 +7973,8 @@
 
 <xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_sampler_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/src/mapi/glapi/glapi_mapi_tmp.h b/src/mapi/glapi/glapi_mapi_tmp.h
index ca627089b58..02a541edc44 100644
--- a/src/mapi/glapi/glapi_mapi_tmp.h
+++ b/src/mapi/glapi/glapi_mapi_tmp.h
@@ -807,6 +807,20 @@ GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparateiARB)(GLuint buf, GLenum m
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationiARB)(GLuint buf, GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFunciARB)(GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler);
+GLAPI void APIENTRY GLAPI_PREFIX(DeleteSamplers)(GLsizei count, const GLuint *samplers);
+GLAPI void APIENTRY GLAPI_PREFIX(GenSamplers)(GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint *params);
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsSampler)(GLuint sampler);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint *params);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params);
 GLAPI void APIENTRY GLAPI_PREFIX(BindTransformFeedback)(GLenum target, GLuint id);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids);
 GLAPI void APIENTRY GLAPI_PREFIX(DrawTransformFeedback)(GLenum mode, GLuint id);
@@ -819,28 +833,28 @@ GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar);
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void);
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_612)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_613)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_614)(GLuint program, GLenum pname, GLint value);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_626)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_627)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_628)(GLuint program, GLenum pname, GLint value);
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_616)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_617)(const GLfloat *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_618)(GLint x, GLint y, GLint z, GLint width, GLint height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_619)(const GLint *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_620)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_621)(const GLshort *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_622)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_623)(const GLfixed *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_624)(GLenum type, GLsizei stride, const GLvoid *pointer);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_625)(GLenum pname, GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_626)(GLenum pname, GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_627)(GLenum pname, GLfloat param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_628)(GLenum pname, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_629)(GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_630)(GLenum pname, const GLint *params);
-GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_631)(GLfixed *mantissa, GLint *exponent);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_632)(GLclampf value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_633)(GLenum pattern);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_630)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_631)(const GLfloat *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_632)(GLint x, GLint y, GLint z, GLint width, GLint height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_633)(const GLint *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_634)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_635)(const GLshort *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_636)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_637)(const GLfixed *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_638)(GLenum type, GLsizei stride, const GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_639)(GLenum pname, GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_640)(GLenum pname, GLint *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_641)(GLenum pname, GLfloat param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_642)(GLenum pname, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_643)(GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_644)(GLenum pname, const GLint *params);
+GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_645)(GLfixed *mantissa, GLint *exponent);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_646)(GLclampf value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_647)(GLenum pattern);
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
@@ -903,7 +917,7 @@ GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_668)(GLenum mode);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_682)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void);
@@ -978,15 +992,15 @@ GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLi
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLsizei n, const GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLsizei n, GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLuint fence, GLenum pname, GLint *params);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_717)(GLuint fence, GLenum condition);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_718)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_724)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_725)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_726)(GLsizei n, const GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_727)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_728)(GLsizei n, GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_729)(GLuint fence, GLenum pname, GLint *params);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_730)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_731)(GLuint fence, GLenum condition);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_732)(GLuint fence);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program);
@@ -1075,12 +1089,12 @@ GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLenum face);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint array);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_801)(GLsizei n, const GLuint *arrays);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_813)(GLenum face);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_814)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_815)(GLsizei n, const GLuint *arrays);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_802)(GLsizei n, GLuint *arrays);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_803)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_816)(GLsizei n, GLuint *arrays);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_817)(GLuint array);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
@@ -1091,54 +1105,54 @@ GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_812)(GLenum func, GLclampx ref);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_813)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_814)(GLclampx depth);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_815)(GLenum plane, const GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_816)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_817)(GLclampx zNear, GLclampx zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_818)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_819)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_820)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_821)(GLenum plane, GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_822)(GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_823)(GLenum light, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_824)(GLenum face, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_825)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_826)(GLenum coord, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_827)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_828)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_829)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_830)(GLenum light, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_831)(GLenum light, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_832)(GLfixed width);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_833)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_834)(GLenum face, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_835)(GLenum face, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_836)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_837)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_838)(GLfixed nx, GLfixed ny, GLfixed nz);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_839)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_840)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_841)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_842)(GLfixed size);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_843)(GLfixed factor, GLfixed units);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_844)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_845)(GLclampx value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_846)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_847)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_848)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_849)(GLenum coord, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_850)(GLenum coord, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_851)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_852)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_853)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_854)(GLenum plane, const GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_855)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_856)(GLenum plane, GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_857)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_858)(GLclampd zmin, GLclampd zmax);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_859)(GLenum modeRGB, GLenum modeA);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_826)(GLenum func, GLclampx ref);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_827)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_828)(GLclampx depth);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_829)(GLenum plane, const GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_830)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_831)(GLclampx zNear, GLclampx zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_832)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_833)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_834)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_835)(GLenum plane, GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_836)(GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_837)(GLenum light, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_838)(GLenum face, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_839)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_840)(GLenum coord, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_841)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_842)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_843)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_844)(GLenum light, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_845)(GLenum light, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_846)(GLfixed width);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_847)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_848)(GLenum face, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_849)(GLenum face, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_850)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_851)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_852)(GLfixed nx, GLfixed ny, GLfixed nz);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_853)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_854)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_855)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_856)(GLfixed size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_857)(GLfixed factor, GLfixed units);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_858)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_859)(GLclampx value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_860)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_861)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_862)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_863)(GLenum coord, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_864)(GLenum coord, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_865)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_866)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_867)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_868)(GLenum plane, const GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_869)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_870)(GLenum plane, GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_871)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_872)(GLclampd zmin, GLclampd zmax);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_873)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer);
@@ -1174,10 +1188,10 @@ GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_877)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_891)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_878)(GLenum target, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_879)(GLenum target, GLintptr offset, GLsizeiptr size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_892)(GLenum target, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_893)(GLenum target, GLintptr offset, GLsizeiptr size);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name);
@@ -1289,8 +1303,8 @@ GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, G
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLenum target, GLenum pname, GLvoid **params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLenum target, GLsizei length, GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_951)(GLenum target, GLenum pname, GLvoid **params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_952)(GLenum target, GLsizei length, GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
@@ -1298,11 +1312,11 @@ GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program);
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string);
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_946)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_947)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_948)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_949)(GLuint id, GLenum pname, GLint64EXT *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_950)(GLuint id, GLenum pname, GLuint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_960)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_961)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_963)(GLuint id, GLenum pname, GLint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_964)(GLuint id, GLenum pname, GLuint64EXT *params);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset);
 #undef MAPI_TMP_DEFINES
@@ -6748,2831 +6762,2929 @@ GLAPI void APIENTRY GLAPI_PREFIX(BlendFunciARB)(GLuint buf, GLenum src, GLenum d
    ((void (APIENTRY *)(GLuint buf, GLenum src, GLenum dst)) _func)(buf, src, dst);
 }
 
-GLAPI void APIENTRY GLAPI_PREFIX(BindTransformFeedback)(GLenum target, GLuint id)
+GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler)
 {
    const struct mapi_table *_tbl = entry_current_get();
    mapi_func _func = ((const mapi_func *) _tbl)[600];
+   ((void (APIENTRY *)(GLuint unit, GLuint sampler)) _func)(unit, sampler);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(DeleteSamplers)(GLsizei count, const GLuint *samplers)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[601];
+   ((void (APIENTRY *)(GLsizei count, const GLuint *samplers)) _func)(count, samplers);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(GenSamplers)(GLsizei count, GLuint *samplers)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[602];
+   ((void (APIENTRY *)(GLsizei count, GLuint *samplers)) _func)(count, samplers);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[603];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[604];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLuint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[605];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[606];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsSampler)(GLuint sampler)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[607];
+   return ((GLboolean (APIENTRY *)(GLuint sampler)) _func)(sampler);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[608];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[609];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLuint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[610];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat param)) _func)(sampler, pname, param);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[611];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLfloat *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteri)(GLuint sampler, GLenum pname, GLint param)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[612];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint param)) _func)(sampler, pname, param);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[613];
+   ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(BindTransformFeedback)(GLenum target, GLuint id)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[614];
    ((void (APIENTRY *)(GLenum target, GLuint id)) _func)(target, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[601];
+   mapi_func _func = ((const mapi_func *) _tbl)[615];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawTransformFeedback)(GLenum mode, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[602];
+   mapi_func _func = ((const mapi_func *) _tbl)[616];
    ((void (APIENTRY *)(GLenum mode, GLuint id)) _func)(mode, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenTransformFeedbacks)(GLsizei n, GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[603];
+   mapi_func _func = ((const mapi_func *) _tbl)[617];
    ((void (APIENTRY *)(GLsizei n, GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsTransformFeedback)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[604];
+   mapi_func _func = ((const mapi_func *) _tbl)[618];
    return ((GLboolean (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PauseTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[605];
+   mapi_func _func = ((const mapi_func *) _tbl)[619];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResumeTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[606];
+   mapi_func _func = ((const mapi_func *) _tbl)[620];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearDepthf)(GLclampf depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[607];
+   mapi_func _func = ((const mapi_func *) _tbl)[621];
    ((void (APIENTRY *)(GLclampf depth)) _func)(depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[608];
+   mapi_func _func = ((const mapi_func *) _tbl)[622];
    ((void (APIENTRY *)(GLclampf zNear, GLclampf zFar)) _func)(zNear, zFar);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[609];
+   mapi_func _func = ((const mapi_func *) _tbl)[623];
    ((void (APIENTRY *)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)) _func)(shadertype, precisiontype, range, precision);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[610];
+   mapi_func _func = ((const mapi_func *) _tbl)[624];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[611];
+   mapi_func _func = ((const mapi_func *) _tbl)[625];
    ((void (APIENTRY *)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)) _func)(n, shaders, binaryformat, binary, length);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[615];
+   mapi_func _func = ((const mapi_func *) _tbl)[629];
    ((void (APIENTRY *)(GLfloat factor, GLfloat bias)) _func)(factor, bias);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[634];
+   mapi_func _func = ((const mapi_func *) _tbl)[648];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[635];
+   mapi_func _func = ((const mapi_func *) _tbl)[649];
    ((void (APIENTRY *)(GLsizei stride, GLsizei count, const GLboolean *pointer)) _func)(stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[636];
+   mapi_func _func = ((const mapi_func *) _tbl)[650];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[637];
+   mapi_func _func = ((const mapi_func *) _tbl)[651];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[638];
+   mapi_func _func = ((const mapi_func *) _tbl)[652];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[639];
+   mapi_func _func = ((const mapi_func *) _tbl)[653];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfEXT)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[640];
+   mapi_func _func = ((const mapi_func *) _tbl)[654];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterf)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[640];
+   mapi_func _func = ((const mapi_func *) _tbl)[654];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfARB)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[640];
+   mapi_func _func = ((const mapi_func *) _tbl)[654];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvEXT)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[641];
+   mapi_func _func = ((const mapi_func *) _tbl)[655];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfv)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[641];
+   mapi_func _func = ((const mapi_func *) _tbl)[655];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvARB)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[641];
+   mapi_func _func = ((const mapi_func *) _tbl)[655];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LockArraysEXT)(GLint first, GLsizei count)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[642];
+   mapi_func _func = ((const mapi_func *) _tbl)[656];
    ((void (APIENTRY *)(GLint first, GLsizei count)) _func)(first, count);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UnlockArraysEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[643];
+   mapi_func _func = ((const mapi_func *) _tbl)[657];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[644];
+   mapi_func _func = ((const mapi_func *) _tbl)[658];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[644];
+   mapi_func _func = ((const mapi_func *) _tbl)[658];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bvEXT)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[645];
+   mapi_func _func = ((const mapi_func *) _tbl)[659];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bv)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[645];
+   mapi_func _func = ((const mapi_func *) _tbl)[659];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[646];
+   mapi_func _func = ((const mapi_func *) _tbl)[660];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[646];
+   mapi_func _func = ((const mapi_func *) _tbl)[660];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dvEXT)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[647];
+   mapi_func _func = ((const mapi_func *) _tbl)[661];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[647];
+   mapi_func _func = ((const mapi_func *) _tbl)[661];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[648];
+   mapi_func _func = ((const mapi_func *) _tbl)[662];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3f)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[648];
+   mapi_func _func = ((const mapi_func *) _tbl)[662];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fvEXT)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[649];
+   mapi_func _func = ((const mapi_func *) _tbl)[663];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[649];
+   mapi_func _func = ((const mapi_func *) _tbl)[663];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iEXT)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[650];
+   mapi_func _func = ((const mapi_func *) _tbl)[664];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3i)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[650];
+   mapi_func _func = ((const mapi_func *) _tbl)[664];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ivEXT)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[651];
+   mapi_func _func = ((const mapi_func *) _tbl)[665];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[651];
+   mapi_func _func = ((const mapi_func *) _tbl)[665];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[652];
+   mapi_func _func = ((const mapi_func *) _tbl)[666];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3s)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[652];
+   mapi_func _func = ((const mapi_func *) _tbl)[666];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3svEXT)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[653];
+   mapi_func _func = ((const mapi_func *) _tbl)[667];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[653];
+   mapi_func _func = ((const mapi_func *) _tbl)[667];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[654];
+   mapi_func _func = ((const mapi_func *) _tbl)[668];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[654];
+   mapi_func _func = ((const mapi_func *) _tbl)[668];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubvEXT)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[655];
+   mapi_func _func = ((const mapi_func *) _tbl)[669];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubv)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[655];
+   mapi_func _func = ((const mapi_func *) _tbl)[669];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[656];
+   mapi_func _func = ((const mapi_func *) _tbl)[670];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[656];
+   mapi_func _func = ((const mapi_func *) _tbl)[670];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uivEXT)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[657];
+   mapi_func _func = ((const mapi_func *) _tbl)[671];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiv)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[657];
+   mapi_func _func = ((const mapi_func *) _tbl)[671];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[658];
+   mapi_func _func = ((const mapi_func *) _tbl)[672];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3us)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[658];
+   mapi_func _func = ((const mapi_func *) _tbl)[672];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usvEXT)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[659];
+   mapi_func _func = ((const mapi_func *) _tbl)[673];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usv)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[659];
+   mapi_func _func = ((const mapi_func *) _tbl)[673];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[660];
+   mapi_func _func = ((const mapi_func *) _tbl)[674];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[660];
+   mapi_func _func = ((const mapi_func *) _tbl)[674];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArraysEXT)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[661];
+   mapi_func _func = ((const mapi_func *) _tbl)[675];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArrays)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[661];
+   mapi_func _func = ((const mapi_func *) _tbl)[675];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElementsEXT)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[662];
+   mapi_func _func = ((const mapi_func *) _tbl)[676];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElements)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[662];
+   mapi_func _func = ((const mapi_func *) _tbl)[676];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[663];
+   mapi_func _func = ((const mapi_func *) _tbl)[677];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[663];
+   mapi_func _func = ((const mapi_func *) _tbl)[677];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddEXT)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[664];
+   mapi_func _func = ((const mapi_func *) _tbl)[678];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordd)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[664];
+   mapi_func _func = ((const mapi_func *) _tbl)[678];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddvEXT)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[665];
+   mapi_func _func = ((const mapi_func *) _tbl)[679];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddv)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[665];
+   mapi_func _func = ((const mapi_func *) _tbl)[679];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[666];
+   mapi_func _func = ((const mapi_func *) _tbl)[680];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[666];
+   mapi_func _func = ((const mapi_func *) _tbl)[680];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[667];
+   mapi_func _func = ((const mapi_func *) _tbl)[681];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[667];
+   mapi_func _func = ((const mapi_func *) _tbl)[681];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[669];
+   mapi_func _func = ((const mapi_func *) _tbl)[683];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[669];
+   mapi_func _func = ((const mapi_func *) _tbl)[683];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[670];
+   mapi_func _func = ((const mapi_func *) _tbl)[684];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexArrayRangeNV)(GLsizei length, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[671];
+   mapi_func _func = ((const mapi_func *) _tbl)[685];
    ((void (APIENTRY *)(GLsizei length, const GLvoid *pointer)) _func)(length, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[672];
+   mapi_func _func = ((const mapi_func *) _tbl)[686];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(stage, portion, variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[673];
+   mapi_func _func = ((const mapi_func *) _tbl)[687];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)) _func)(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfNV)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[674];
+   mapi_func _func = ((const mapi_func *) _tbl)[688];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfvNV)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[675];
+   mapi_func _func = ((const mapi_func *) _tbl)[689];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[676];
+   mapi_func _func = ((const mapi_func *) _tbl)[690];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[677];
+   mapi_func _func = ((const mapi_func *) _tbl)[691];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[678];
+   mapi_func _func = ((const mapi_func *) _tbl)[692];
    ((void (APIENTRY *)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[679];
+   mapi_func _func = ((const mapi_func *) _tbl)[693];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[680];
+   mapi_func _func = ((const mapi_func *) _tbl)[694];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[681];
+   mapi_func _func = ((const mapi_func *) _tbl)[695];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[682];
+   mapi_func _func = ((const mapi_func *) _tbl)[696];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLint *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[683];
+   mapi_func _func = ((const mapi_func *) _tbl)[697];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLfloat *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[684];
+   mapi_func _func = ((const mapi_func *) _tbl)[698];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLint *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResizeBuffersMESA)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[685];
+   mapi_func _func = ((const mapi_func *) _tbl)[699];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dMESA)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[700];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2d)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[700];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dARB)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[700];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[701];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[701];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[701];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fMESA)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[702];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2f)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[702];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fARB)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[702];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[703];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[703];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[703];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iMESA)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[704];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2i)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[704];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iARB)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[704];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[705];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[705];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[705];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sMESA)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[706];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2s)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[706];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sARB)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[706];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[707];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[707];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[707];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[708];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3d)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[708];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[708];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[695];
+   mapi_func _func = ((const mapi_func *) _tbl)[709];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[695];
+   mapi_func _func = ((const mapi_func *) _tbl)[709];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[695];
+   mapi_func _func = ((const mapi_func *) _tbl)[709];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[696];
+   mapi_func _func = ((const mapi_func *) _tbl)[710];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3f)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[696];
+   mapi_func _func = ((const mapi_func *) _tbl)[710];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[696];
+   mapi_func _func = ((const mapi_func *) _tbl)[710];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[697];
+   mapi_func _func = ((const mapi_func *) _tbl)[711];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[697];
+   mapi_func _func = ((const mapi_func *) _tbl)[711];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[697];
+   mapi_func _func = ((const mapi_func *) _tbl)[711];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iMESA)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[698];
+   mapi_func _func = ((const mapi_func *) _tbl)[712];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3i)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[698];
+   mapi_func _func = ((const mapi_func *) _tbl)[712];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iARB)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[698];
+   mapi_func _func = ((const mapi_func *) _tbl)[712];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[699];
+   mapi_func _func = ((const mapi_func *) _tbl)[713];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[699];
+   mapi_func _func = ((const mapi_func *) _tbl)[713];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[699];
+   mapi_func _func = ((const mapi_func *) _tbl)[713];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sMESA)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[700];
+   mapi_func _func = ((const mapi_func *) _tbl)[714];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3s)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[700];
+   mapi_func _func = ((const mapi_func *) _tbl)[714];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sARB)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[700];
+   mapi_func _func = ((const mapi_func *) _tbl)[714];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[701];
+   mapi_func _func = ((const mapi_func *) _tbl)[715];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[701];
+   mapi_func _func = ((const mapi_func *) _tbl)[715];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[701];
+   mapi_func _func = ((const mapi_func *) _tbl)[715];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[702];
+   mapi_func _func = ((const mapi_func *) _tbl)[716];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[703];
+   mapi_func _func = ((const mapi_func *) _tbl)[717];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[704];
+   mapi_func _func = ((const mapi_func *) _tbl)[718];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[705];
+   mapi_func _func = ((const mapi_func *) _tbl)[719];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[706];
+   mapi_func _func = ((const mapi_func *) _tbl)[720];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z, GLint w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[707];
+   mapi_func _func = ((const mapi_func *) _tbl)[721];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[708];
+   mapi_func _func = ((const mapi_func *) _tbl)[722];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z, GLshort w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[709];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    return ((GLboolean (APIENTRY *)(GLsizei n, const GLuint *ids, GLboolean *residences)) _func)(n, ids, residences);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsNV)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[721];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsARB)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[721];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[722];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((void (APIENTRY *)(GLenum target, GLuint id, const GLfloat *params)) _func)(target, id, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsNV)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsARB)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLdouble *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLfloat *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramStringNV)(GLuint id, GLenum pname, GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLubyte *program)) _func)(id, pname, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramivNV)(GLuint id, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum pname, GLint *params)) _func)(target, address, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLdouble *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLfloat *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribivNV)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramNV)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramARB)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((void (APIENTRY *)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)) _func)(target, id, len, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RequestResidentProgramsNV)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[751];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[752];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum matrix, GLenum transform)) _func)(target, address, matrix, transform);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dNV)(GLuint index, GLdouble x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[753];
    ((void (APIENTRY *)(GLuint index, GLdouble x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[754];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fNV)(GLuint index, GLfloat x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[755];
    ((void (APIENTRY *)(GLuint index, GLfloat x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[756];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1sNV)(GLuint index, GLshort x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[757];
    ((void (APIENTRY *)(GLuint index, GLshort x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[758];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[759];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[760];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[747];
+   mapi_func _func = ((const mapi_func *) _tbl)[761];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[762];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[763];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[764];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[751];
+   mapi_func _func = ((const mapi_func *) _tbl)[765];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[766];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[753];
+   mapi_func _func = ((const mapi_func *) _tbl)[767];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[754];
+   mapi_func _func = ((const mapi_func *) _tbl)[768];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[755];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[756];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[757];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[758];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[759];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[760];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[761];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[762];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[763];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubvNV)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[764];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[787];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[788];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[789];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[790];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[791];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[792];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLubyte *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterfvATI)(GLenum pname, GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[793];
    ((void (APIENTRY *)(GLenum pname, GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterivATI)(GLenum pname, GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[794];
    ((void (APIENTRY *)(GLenum pname, GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterfvATI)(GLenum pname, const GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[795];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterivATI)(GLenum pname, const GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[796];
    ((void (APIENTRY *)(GLenum pname, const GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[797];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[798];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[799];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[800];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[787];
+   mapi_func _func = ((const mapi_func *) _tbl)[801];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[788];
+   mapi_func _func = ((const mapi_func *) _tbl)[802];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[789];
+   mapi_func _func = ((const mapi_func *) _tbl)[803];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[790];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[791];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[792];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(GenFragmentShadersATI)(GLuint range)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[793];
+   mapi_func _func = ((const mapi_func *) _tbl)[807];
    return ((GLuint (APIENTRY *)(GLuint range)) _func)(range);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[794];
+   mapi_func _func = ((const mapi_func *) _tbl)[808];
    ((void (APIENTRY *)(GLuint dst, GLuint coord, GLenum swizzle)) _func)(dst, coord, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[795];
+   mapi_func _func = ((const mapi_func *) _tbl)[809];
    ((void (APIENTRY *)(GLuint dst, GLuint interp, GLenum swizzle)) _func)(dst, interp, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SetFragmentShaderConstantATI)(GLuint dst, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[796];
+   mapi_func _func = ((const mapi_func *) _tbl)[810];
    ((void (APIENTRY *)(GLuint dst, const GLfloat *value)) _func)(dst, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[797];
+   mapi_func _func = ((const mapi_func *) _tbl)[811];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[797];
+   mapi_func _func = ((const mapi_func *) _tbl)[811];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[798];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[798];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[801];
+   mapi_func _func = ((const mapi_func *) _tbl)[815];
    ((void (APIENTRY *)(GLsizei n, const GLuint *arrays)) _func)(n, arrays);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[803];
+   mapi_func _func = ((const mapi_func *) _tbl)[817];
    return ((GLboolean (APIENTRY *)(GLuint array)) _func)(array);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[804];
+   mapi_func _func = ((const mapi_func *) _tbl)[818];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[805];
+   mapi_func _func = ((const mapi_func *) _tbl)[819];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[820];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[807];
+   mapi_func _func = ((const mapi_func *) _tbl)[821];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[822];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[809];
+   mapi_func _func = ((const mapi_func *) _tbl)[823];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[810];
+   mapi_func _func = ((const mapi_func *) _tbl)[824];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[810];
+   mapi_func _func = ((const mapi_func *) _tbl)[824];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[811];
+   mapi_func _func = ((const mapi_func *) _tbl)[825];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[859];
+   mapi_func _func = ((const mapi_func *) _tbl)[873];
    ((void (APIENTRY *)(GLenum modeRGB, GLenum modeA)) _func)(modeRGB, modeA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[860];
+   mapi_func _func = ((const mapi_func *) _tbl)[874];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[860];
+   mapi_func _func = ((const mapi_func *) _tbl)[874];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbufferEXT)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[861];
+   mapi_func _func = ((const mapi_func *) _tbl)[875];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbuffer)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[861];
+   mapi_func _func = ((const mapi_func *) _tbl)[875];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatusEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[862];
+   mapi_func _func = ((const mapi_func *) _tbl)[876];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatus)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[862];
+   mapi_func _func = ((const mapi_func *) _tbl)[876];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[863];
+   mapi_func _func = ((const mapi_func *) _tbl)[877];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffers)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[863];
+   mapi_func _func = ((const mapi_func *) _tbl)[877];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffersEXT)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[864];
+   mapi_func _func = ((const mapi_func *) _tbl)[878];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffers)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[864];
+   mapi_func _func = ((const mapi_func *) _tbl)[878];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[865];
+   mapi_func _func = ((const mapi_func *) _tbl)[879];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[865];
+   mapi_func _func = ((const mapi_func *) _tbl)[879];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[866];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[866];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[867];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[867];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[868];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[868];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffersEXT)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[869];
+   mapi_func _func = ((const mapi_func *) _tbl)[883];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffers)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[869];
+   mapi_func _func = ((const mapi_func *) _tbl)[883];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffersEXT)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[870];
+   mapi_func _func = ((const mapi_func *) _tbl)[884];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffers)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[870];
+   mapi_func _func = ((const mapi_func *) _tbl)[884];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmapEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[871];
+   mapi_func _func = ((const mapi_func *) _tbl)[885];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmap)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[871];
+   mapi_func _func = ((const mapi_func *) _tbl)[885];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[872];
+   mapi_func _func = ((const mapi_func *) _tbl)[886];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[872];
+   mapi_func _func = ((const mapi_func *) _tbl)[886];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[873];
+   mapi_func _func = ((const mapi_func *) _tbl)[887];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[873];
+   mapi_func _func = ((const mapi_func *) _tbl)[887];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebufferEXT)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[874];
+   mapi_func _func = ((const mapi_func *) _tbl)[888];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebuffer)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[874];
+   mapi_func _func = ((const mapi_func *) _tbl)[888];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[875];
+   mapi_func _func = ((const mapi_func *) _tbl)[889];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[875];
+   mapi_func _func = ((const mapi_func *) _tbl)[889];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[890];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[890];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[877];
+   mapi_func _func = ((const mapi_func *) _tbl)[891];
    ((void (APIENTRY *)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) _func)(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[881];
+   mapi_func _func = ((const mapi_func *) _tbl)[895];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocation)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[881];
+   mapi_func _func = ((const mapi_func *) _tbl)[895];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuivEXT)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[882];
+   mapi_func _func = ((const mapi_func *) _tbl)[896];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuiv)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[882];
+   mapi_func _func = ((const mapi_func *) _tbl)[896];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[883];
+   mapi_func _func = ((const mapi_func *) _tbl)[897];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[883];
+   mapi_func _func = ((const mapi_func *) _tbl)[897];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[884];
+   mapi_func _func = ((const mapi_func *) _tbl)[898];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[884];
+   mapi_func _func = ((const mapi_func *) _tbl)[898];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiEXT)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[885];
+   mapi_func _func = ((const mapi_func *) _tbl)[899];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1ui)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[885];
+   mapi_func _func = ((const mapi_func *) _tbl)[899];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[886];
+   mapi_func _func = ((const mapi_func *) _tbl)[900];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[886];
+   mapi_func _func = ((const mapi_func *) _tbl)[900];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiEXT)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[887];
+   mapi_func _func = ((const mapi_func *) _tbl)[901];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2ui)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[887];
+   mapi_func _func = ((const mapi_func *) _tbl)[901];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[888];
+   mapi_func _func = ((const mapi_func *) _tbl)[902];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[888];
+   mapi_func _func = ((const mapi_func *) _tbl)[902];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[903];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3ui)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[903];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[890];
+   mapi_func _func = ((const mapi_func *) _tbl)[904];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[890];
+   mapi_func _func = ((const mapi_func *) _tbl)[904];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[891];
+   mapi_func _func = ((const mapi_func *) _tbl)[905];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4ui)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[891];
+   mapi_func _func = ((const mapi_func *) _tbl)[905];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[892];
+   mapi_func _func = ((const mapi_func *) _tbl)[906];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[892];
+   mapi_func _func = ((const mapi_func *) _tbl)[906];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iEXT)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[893];
+   mapi_func _func = ((const mapi_func *) _tbl)[907];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1i)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[893];
+   mapi_func _func = ((const mapi_func *) _tbl)[907];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[894];
+   mapi_func _func = ((const mapi_func *) _tbl)[908];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[894];
+   mapi_func _func = ((const mapi_func *) _tbl)[908];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiEXT)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[895];
+   mapi_func _func = ((const mapi_func *) _tbl)[909];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ui)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[895];
+   mapi_func _func = ((const mapi_func *) _tbl)[909];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[896];
+   mapi_func _func = ((const mapi_func *) _tbl)[910];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[896];
+   mapi_func _func = ((const mapi_func *) _tbl)[910];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iEXT)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[897];
+   mapi_func _func = ((const mapi_func *) _tbl)[911];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2i)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[897];
+   mapi_func _func = ((const mapi_func *) _tbl)[911];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[898];
+   mapi_func _func = ((const mapi_func *) _tbl)[912];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[898];
+   mapi_func _func = ((const mapi_func *) _tbl)[912];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[899];
+   mapi_func _func = ((const mapi_func *) _tbl)[913];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[899];
+   mapi_func _func = ((const mapi_func *) _tbl)[913];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[900];
+   mapi_func _func = ((const mapi_func *) _tbl)[914];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[900];
+   mapi_func _func = ((const mapi_func *) _tbl)[914];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[901];
+   mapi_func _func = ((const mapi_func *) _tbl)[915];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[901];
+   mapi_func _func = ((const mapi_func *) _tbl)[915];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[902];
+   mapi_func _func = ((const mapi_func *) _tbl)[916];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[902];
+   mapi_func _func = ((const mapi_func *) _tbl)[916];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[903];
+   mapi_func _func = ((const mapi_func *) _tbl)[917];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[903];
+   mapi_func _func = ((const mapi_func *) _tbl)[917];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[904];
+   mapi_func _func = ((const mapi_func *) _tbl)[918];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[904];
+   mapi_func _func = ((const mapi_func *) _tbl)[918];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bvEXT)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[905];
+   mapi_func _func = ((const mapi_func *) _tbl)[919];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bv)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[905];
+   mapi_func _func = ((const mapi_func *) _tbl)[919];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[906];
+   mapi_func _func = ((const mapi_func *) _tbl)[920];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[906];
+   mapi_func _func = ((const mapi_func *) _tbl)[920];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[907];
+   mapi_func _func = ((const mapi_func *) _tbl)[921];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[907];
+   mapi_func _func = ((const mapi_func *) _tbl)[921];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4svEXT)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[908];
+   mapi_func _func = ((const mapi_func *) _tbl)[922];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[908];
+   mapi_func _func = ((const mapi_func *) _tbl)[922];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubvEXT)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[909];
+   mapi_func _func = ((const mapi_func *) _tbl)[923];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubv)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[909];
+   mapi_func _func = ((const mapi_func *) _tbl)[923];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[910];
+   mapi_func _func = ((const mapi_func *) _tbl)[924];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[910];
+   mapi_func _func = ((const mapi_func *) _tbl)[924];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[911];
+   mapi_func _func = ((const mapi_func *) _tbl)[925];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[911];
+   mapi_func _func = ((const mapi_func *) _tbl)[925];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usvEXT)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[912];
+   mapi_func _func = ((const mapi_func *) _tbl)[926];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usv)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[912];
+   mapi_func _func = ((const mapi_func *) _tbl)[926];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[913];
+   mapi_func _func = ((const mapi_func *) _tbl)[927];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[913];
+   mapi_func _func = ((const mapi_func *) _tbl)[927];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[914];
+   mapi_func _func = ((const mapi_func *) _tbl)[928];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[914];
+   mapi_func _func = ((const mapi_func *) _tbl)[928];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[915];
+   mapi_func _func = ((const mapi_func *) _tbl)[929];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaski)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[915];
+   mapi_func _func = ((const mapi_func *) _tbl)[929];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DisableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[916];
+   mapi_func _func = ((const mapi_func *) _tbl)[930];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Disablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[916];
+   mapi_func _func = ((const mapi_func *) _tbl)[930];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EnableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[917];
+   mapi_func _func = ((const mapi_func *) _tbl)[931];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Enablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[917];
+   mapi_func _func = ((const mapi_func *) _tbl)[931];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[918];
+   mapi_func _func = ((const mapi_func *) _tbl)[932];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleani_v)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[918];
+   mapi_func _func = ((const mapi_func *) _tbl)[932];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[919];
+   mapi_func _func = ((const mapi_func *) _tbl)[933];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegeri_v)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[919];
+   mapi_func _func = ((const mapi_func *) _tbl)[933];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[920];
+   mapi_func _func = ((const mapi_func *) _tbl)[934];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledi)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[920];
+   mapi_func _func = ((const mapi_func *) _tbl)[934];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[921];
+   mapi_func _func = ((const mapi_func *) _tbl)[935];
    ((void (APIENTRY *)(GLint r, GLint g, GLint b, GLint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[922];
+   mapi_func _func = ((const mapi_func *) _tbl)[936];
    ((void (APIENTRY *)(GLuint r, GLuint g, GLuint b, GLuint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[923];
+   mapi_func _func = ((const mapi_func *) _tbl)[937];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIiv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[923];
+   mapi_func _func = ((const mapi_func *) _tbl)[937];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[924];
+   mapi_func _func = ((const mapi_func *) _tbl)[938];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[924];
+   mapi_func _func = ((const mapi_func *) _tbl)[938];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIivEXT)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[925];
+   mapi_func _func = ((const mapi_func *) _tbl)[939];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIiv)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[925];
+   mapi_func _func = ((const mapi_func *) _tbl)[939];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[926];
+   mapi_func _func = ((const mapi_func *) _tbl)[940];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuiv)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[926];
+   mapi_func _func = ((const mapi_func *) _tbl)[940];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRenderNV)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[927];
+   mapi_func _func = ((const mapi_func *) _tbl)[941];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRender)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[927];
+   mapi_func _func = ((const mapi_func *) _tbl)[941];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRenderNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[928];
+   mapi_func _func = ((const mapi_func *) _tbl)[942];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRender)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[928];
+   mapi_func _func = ((const mapi_func *) _tbl)[942];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedbackEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[929];
+   mapi_func _func = ((const mapi_func *) _tbl)[943];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedback)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[929];
+   mapi_func _func = ((const mapi_func *) _tbl)[943];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[930];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBase)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[930];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[931];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)) _func)(target, index, buffer, offset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[932];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[932];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedbackEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[933];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[933];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[934];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[934];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[935];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[935];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[936];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[936];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[939];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((void (APIENTRY *)(GLenum objectType, GLuint name, GLenum pname, GLint *value)) _func)(objectType, name, pname, value);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[940];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[941];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[942];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[943];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    return ((GLuint (APIENTRY *)(GLenum type, const GLchar *string)) _func)(type, string);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    ((void (APIENTRY *)(GLenum type, GLuint program)) _func)(type, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
@@ -11921,65 +12033,107 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFuncSeparateiARB))"\n"
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFunciARB))"\n"
 "\t"STUB_ASM_CODE("599")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindSampler))"\n"
 "\t"STUB_ASM_CODE("600")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteTransformFeedbacks))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteSamplers))"\n"
 "\t"STUB_ASM_CODE("601")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenSamplers))"\n"
 "\t"STUB_ASM_CODE("602")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenTransformFeedbacks))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIiv))"\n"
 "\t"STUB_ASM_CODE("603")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIuiv))"\n"
 "\t"STUB_ASM_CODE("604")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PauseTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterfv))"\n"
 "\t"STUB_ASM_CODE("605")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResumeTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameteriv))"\n"
 "\t"STUB_ASM_CODE("606")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearDepthf))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsSampler))"\n"
 "\t"STUB_ASM_CODE("607")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DepthRangef))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIiv))"\n"
 "\t"STUB_ASM_CODE("608")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderPrecisionFormat))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIuiv))"\n"
 "\t"STUB_ASM_CODE("609")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterf))"\n"
 "\t"STUB_ASM_CODE("610")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterfv))"\n"
 "\t"STUB_ASM_CODE("611")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteri))"\n"
+"\t"STUB_ASM_CODE("612")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteriv))"\n"
+"\t"STUB_ASM_CODE("613")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindTransformFeedback))"\n"
+"\t"STUB_ASM_CODE("614")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteTransformFeedbacks))"\n"
 "\t"STUB_ASM_CODE("615")"\n"
 
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawTransformFeedback))"\n"
+"\t"STUB_ASM_CODE("616")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenTransformFeedbacks))"\n"
+"\t"STUB_ASM_CODE("617")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsTransformFeedback))"\n"
+"\t"STUB_ASM_CODE("618")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PauseTransformFeedback))"\n"
+"\t"STUB_ASM_CODE("619")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResumeTransformFeedback))"\n"
+"\t"STUB_ASM_CODE("620")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearDepthf))"\n"
+"\t"STUB_ASM_CODE("621")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DepthRangef))"\n"
+"\t"STUB_ASM_CODE("622")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderPrecisionFormat))"\n"
+"\t"STUB_ASM_CODE("623")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
+"\t"STUB_ASM_CODE("624")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
+"\t"STUB_ASM_CODE("625")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
+"\t"STUB_ASM_CODE("629")"\n"
+
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("634")"\n"
+"\t"STUB_ASM_CODE("648")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EdgeFlagPointerEXT))"\n"
-"\t"STUB_ASM_CODE("635")"\n"
+"\t"STUB_ASM_CODE("649")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IndexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("636")"\n"
+"\t"STUB_ASM_CODE("650")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalPointerEXT))"\n"
-"\t"STUB_ASM_CODE("637")"\n"
+"\t"STUB_ASM_CODE("651")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("638")"\n"
+"\t"STUB_ASM_CODE("652")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("639")"\n"
+"\t"STUB_ASM_CODE("653")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
-"\t"STUB_ASM_CODE("640")"\n"
+"\t"STUB_ASM_CODE("654")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterf)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterf)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
@@ -11988,7 +12142,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfARB)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
-"\t"STUB_ASM_CODE("641")"\n"
+"\t"STUB_ASM_CODE("655")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterfv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfv)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
@@ -11997,211 +12151,211 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfvARB)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("642")"\n"
+"\t"STUB_ASM_CODE("656")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UnlockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("643")"\n"
+"\t"STUB_ASM_CODE("657")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bEXT))"\n"
-"\t"STUB_ASM_CODE("644")"\n"
+"\t"STUB_ASM_CODE("658")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3b)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3b)", "GLAPI_PREFIX_STR(SecondaryColor3bEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bvEXT))"\n"
-"\t"STUB_ASM_CODE("645")"\n"
+"\t"STUB_ASM_CODE("659")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3bv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3bv)", "GLAPI_PREFIX_STR(SecondaryColor3bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dEXT))"\n"
-"\t"STUB_ASM_CODE("646")"\n"
+"\t"STUB_ASM_CODE("660")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3d)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3d)", "GLAPI_PREFIX_STR(SecondaryColor3dEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dvEXT))"\n"
-"\t"STUB_ASM_CODE("647")"\n"
+"\t"STUB_ASM_CODE("661")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3dv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3dv)", "GLAPI_PREFIX_STR(SecondaryColor3dvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fEXT))"\n"
-"\t"STUB_ASM_CODE("648")"\n"
+"\t"STUB_ASM_CODE("662")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3f)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3f)", "GLAPI_PREFIX_STR(SecondaryColor3fEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fvEXT))"\n"
-"\t"STUB_ASM_CODE("649")"\n"
+"\t"STUB_ASM_CODE("663")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3fv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3fv)", "GLAPI_PREFIX_STR(SecondaryColor3fvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3iEXT))"\n"
-"\t"STUB_ASM_CODE("650")"\n"
+"\t"STUB_ASM_CODE("664")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3i)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3i)", "GLAPI_PREFIX_STR(SecondaryColor3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ivEXT))"\n"
-"\t"STUB_ASM_CODE("651")"\n"
+"\t"STUB_ASM_CODE("665")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3iv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3iv)", "GLAPI_PREFIX_STR(SecondaryColor3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3sEXT))"\n"
-"\t"STUB_ASM_CODE("652")"\n"
+"\t"STUB_ASM_CODE("666")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3s)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3s)", "GLAPI_PREFIX_STR(SecondaryColor3sEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3svEXT))"\n"
-"\t"STUB_ASM_CODE("653")"\n"
+"\t"STUB_ASM_CODE("667")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3sv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3sv)", "GLAPI_PREFIX_STR(SecondaryColor3svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubEXT))"\n"
-"\t"STUB_ASM_CODE("654")"\n"
+"\t"STUB_ASM_CODE("668")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ub)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ub)", "GLAPI_PREFIX_STR(SecondaryColor3ubEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubvEXT))"\n"
-"\t"STUB_ASM_CODE("655")"\n"
+"\t"STUB_ASM_CODE("669")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ubv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ubv)", "GLAPI_PREFIX_STR(SecondaryColor3ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uiEXT))"\n"
-"\t"STUB_ASM_CODE("656")"\n"
+"\t"STUB_ASM_CODE("670")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ui)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ui)", "GLAPI_PREFIX_STR(SecondaryColor3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uivEXT))"\n"
-"\t"STUB_ASM_CODE("657")"\n"
+"\t"STUB_ASM_CODE("671")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3uiv)", "GLAPI_PREFIX_STR(SecondaryColor3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usEXT))"\n"
-"\t"STUB_ASM_CODE("658")"\n"
+"\t"STUB_ASM_CODE("672")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3us)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3us)", "GLAPI_PREFIX_STR(SecondaryColor3usEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usvEXT))"\n"
-"\t"STUB_ASM_CODE("659")"\n"
+"\t"STUB_ASM_CODE("673")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3usv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3usv)", "GLAPI_PREFIX_STR(SecondaryColor3usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("660")"\n"
+"\t"STUB_ASM_CODE("674")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColorPointer)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColorPointer)", "GLAPI_PREFIX_STR(SecondaryColorPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawArraysEXT))"\n"
-"\t"STUB_ASM_CODE("661")"\n"
+"\t"STUB_ASM_CODE("675")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawArrays)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawArrays)", "GLAPI_PREFIX_STR(MultiDrawArraysEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawElementsEXT))"\n"
-"\t"STUB_ASM_CODE("662")"\n"
+"\t"STUB_ASM_CODE("676")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawElements)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawElements)", "GLAPI_PREFIX_STR(MultiDrawElementsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("663")"\n"
+"\t"STUB_ASM_CODE("677")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordPointer)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordPointer)", "GLAPI_PREFIX_STR(FogCoordPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddEXT))"\n"
-"\t"STUB_ASM_CODE("664")"\n"
+"\t"STUB_ASM_CODE("678")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordd)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordd)", "GLAPI_PREFIX_STR(FogCoorddEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddvEXT))"\n"
-"\t"STUB_ASM_CODE("665")"\n"
+"\t"STUB_ASM_CODE("679")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoorddv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoorddv)", "GLAPI_PREFIX_STR(FogCoorddvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfEXT))"\n"
-"\t"STUB_ASM_CODE("666")"\n"
+"\t"STUB_ASM_CODE("680")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordf)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordf)", "GLAPI_PREFIX_STR(FogCoordfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfvEXT))"\n"
-"\t"STUB_ASM_CODE("667")"\n"
+"\t"STUB_ASM_CODE("681")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordfv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordfv)", "GLAPI_PREFIX_STR(FogCoordfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFuncSeparateEXT))"\n"
-"\t"STUB_ASM_CODE("669")"\n"
+"\t"STUB_ASM_CODE("683")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendFuncSeparate)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncSeparate)", "GLAPI_PREFIX_STR(BlendFuncSeparateEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FlushVertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("670")"\n"
+"\t"STUB_ASM_CODE("684")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("671")"\n"
+"\t"STUB_ASM_CODE("685")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("672")"\n"
+"\t"STUB_ASM_CODE("686")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerOutputNV))"\n"
-"\t"STUB_ASM_CODE("673")"\n"
+"\t"STUB_ASM_CODE("687")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfNV))"\n"
-"\t"STUB_ASM_CODE("674")"\n"
+"\t"STUB_ASM_CODE("688")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("675")"\n"
+"\t"STUB_ASM_CODE("689")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameteriNV))"\n"
-"\t"STUB_ASM_CODE("676")"\n"
+"\t"STUB_ASM_CODE("690")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterivNV))"\n"
-"\t"STUB_ASM_CODE("677")"\n"
+"\t"STUB_ASM_CODE("691")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FinalCombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("678")"\n"
+"\t"STUB_ASM_CODE("692")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("679")"\n"
+"\t"STUB_ASM_CODE("693")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("680")"\n"
+"\t"STUB_ASM_CODE("694")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("681")"\n"
+"\t"STUB_ASM_CODE("695")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("682")"\n"
+"\t"STUB_ASM_CODE("696")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("683")"\n"
+"\t"STUB_ASM_CODE("697")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("684")"\n"
+"\t"STUB_ASM_CODE("698")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResizeBuffersMESA))"\n"
-"\t"STUB_ASM_CODE("685")"\n"
+"\t"STUB_ASM_CODE("699")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
-"\t"STUB_ASM_CODE("686")"\n"
+"\t"STUB_ASM_CODE("700")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2d)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
@@ -12210,7 +12364,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dARB)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
-"\t"STUB_ASM_CODE("687")"\n"
+"\t"STUB_ASM_CODE("701")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dv)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
@@ -12219,7 +12373,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dvARB)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
-"\t"STUB_ASM_CODE("688")"\n"
+"\t"STUB_ASM_CODE("702")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2f)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
@@ -12228,7 +12382,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fARB)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
-"\t"STUB_ASM_CODE("689")"\n"
+"\t"STUB_ASM_CODE("703")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fv)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
@@ -12237,7 +12391,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fvARB)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
-"\t"STUB_ASM_CODE("690")"\n"
+"\t"STUB_ASM_CODE("704")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2i)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
@@ -12246,7 +12400,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iARB)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
-"\t"STUB_ASM_CODE("691")"\n"
+"\t"STUB_ASM_CODE("705")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iv)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
@@ -12255,7 +12409,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2ivARB)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
-"\t"STUB_ASM_CODE("692")"\n"
+"\t"STUB_ASM_CODE("706")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2s)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
@@ -12264,7 +12418,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sARB)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
-"\t"STUB_ASM_CODE("693")"\n"
+"\t"STUB_ASM_CODE("707")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sv)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
@@ -12273,7 +12427,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2svARB)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
-"\t"STUB_ASM_CODE("694")"\n"
+"\t"STUB_ASM_CODE("708")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3d)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
@@ -12282,7 +12436,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dARB)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
-"\t"STUB_ASM_CODE("695")"\n"
+"\t"STUB_ASM_CODE("709")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dv)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
@@ -12291,7 +12445,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dvARB)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
-"\t"STUB_ASM_CODE("696")"\n"
+"\t"STUB_ASM_CODE("710")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3f)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
@@ -12300,7 +12454,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fARB)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
-"\t"STUB_ASM_CODE("697")"\n"
+"\t"STUB_ASM_CODE("711")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fv)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
@@ -12309,7 +12463,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fvARB)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
-"\t"STUB_ASM_CODE("698")"\n"
+"\t"STUB_ASM_CODE("712")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3i)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
@@ -12318,7 +12472,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iARB)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
-"\t"STUB_ASM_CODE("699")"\n"
+"\t"STUB_ASM_CODE("713")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iv)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
@@ -12327,7 +12481,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3ivARB)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
-"\t"STUB_ASM_CODE("700")"\n"
+"\t"STUB_ASM_CODE("714")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3s)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
@@ -12336,7 +12490,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sARB)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
-"\t"STUB_ASM_CODE("701")"\n"
+"\t"STUB_ASM_CODE("715")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sv)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
@@ -12345,70 +12499,70 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3svARB)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dMESA))"\n"
-"\t"STUB_ASM_CODE("702")"\n"
+"\t"STUB_ASM_CODE("716")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dvMESA))"\n"
-"\t"STUB_ASM_CODE("703")"\n"
+"\t"STUB_ASM_CODE("717")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fMESA))"\n"
-"\t"STUB_ASM_CODE("704")"\n"
+"\t"STUB_ASM_CODE("718")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fvMESA))"\n"
-"\t"STUB_ASM_CODE("705")"\n"
+"\t"STUB_ASM_CODE("719")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4iMESA))"\n"
-"\t"STUB_ASM_CODE("706")"\n"
+"\t"STUB_ASM_CODE("720")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4ivMESA))"\n"
-"\t"STUB_ASM_CODE("707")"\n"
+"\t"STUB_ASM_CODE("721")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4sMESA))"\n"
-"\t"STUB_ASM_CODE("708")"\n"
+"\t"STUB_ASM_CODE("722")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4svMESA))"\n"
-"\t"STUB_ASM_CODE("709")"\n"
+"\t"STUB_ASM_CODE("723")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AreProgramsResidentNV))"\n"
-"\t"STUB_ASM_CODE("719")"\n"
+"\t"STUB_ASM_CODE("733")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindProgramNV))"\n"
-"\t"STUB_ASM_CODE("720")"\n"
+"\t"STUB_ASM_CODE("734")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(BindProgramARB)", "GLAPI_PREFIX_STR(BindProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteProgramsNV))"\n"
-"\t"STUB_ASM_CODE("721")"\n"
+"\t"STUB_ASM_CODE("735")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteProgramsARB)", "GLAPI_PREFIX_STR(DeleteProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ExecuteProgramNV))"\n"
-"\t"STUB_ASM_CODE("722")"\n"
+"\t"STUB_ASM_CODE("736")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenProgramsNV))"\n"
-"\t"STUB_ASM_CODE("723")"\n"
+"\t"STUB_ASM_CODE("737")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(GenProgramsARB)", "GLAPI_PREFIX_STR(GenProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("724")"\n"
+"\t"STUB_ASM_CODE("738")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("725")"\n"
+"\t"STUB_ASM_CODE("739")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramStringNV))"\n"
-"\t"STUB_ASM_CODE("726")"\n"
+"\t"STUB_ASM_CODE("740")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramivNV))"\n"
-"\t"STUB_ASM_CODE("727")"\n"
+"\t"STUB_ASM_CODE("741")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTrackMatrixivNV))"\n"
-"\t"STUB_ASM_CODE("728")"\n"
+"\t"STUB_ASM_CODE("742")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
-"\t"STUB_ASM_CODE("729")"\n"
+"\t"STUB_ASM_CODE("743")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribPointerv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointerv)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
@@ -12417,721 +12571,721 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointervARB)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribdvNV))"\n"
-"\t"STUB_ASM_CODE("730")"\n"
+"\t"STUB_ASM_CODE("744")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribfvNV))"\n"
-"\t"STUB_ASM_CODE("731")"\n"
+"\t"STUB_ASM_CODE("745")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribivNV))"\n"
-"\t"STUB_ASM_CODE("732")"\n"
+"\t"STUB_ASM_CODE("746")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsProgramNV))"\n"
-"\t"STUB_ASM_CODE("733")"\n"
+"\t"STUB_ASM_CODE("747")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(IsProgramARB)", "GLAPI_PREFIX_STR(IsProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LoadProgramNV))"\n"
-"\t"STUB_ASM_CODE("734")"\n"
+"\t"STUB_ASM_CODE("748")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4dvNV))"\n"
-"\t"STUB_ASM_CODE("735")"\n"
+"\t"STUB_ASM_CODE("749")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4fvNV))"\n"
-"\t"STUB_ASM_CODE("736")"\n"
+"\t"STUB_ASM_CODE("750")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RequestResidentProgramsNV))"\n"
-"\t"STUB_ASM_CODE("737")"\n"
+"\t"STUB_ASM_CODE("751")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TrackMatrixNV))"\n"
-"\t"STUB_ASM_CODE("738")"\n"
+"\t"STUB_ASM_CODE("752")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dNV))"\n"
-"\t"STUB_ASM_CODE("739")"\n"
+"\t"STUB_ASM_CODE("753")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dvNV))"\n"
-"\t"STUB_ASM_CODE("740")"\n"
+"\t"STUB_ASM_CODE("754")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fNV))"\n"
-"\t"STUB_ASM_CODE("741")"\n"
+"\t"STUB_ASM_CODE("755")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fvNV))"\n"
-"\t"STUB_ASM_CODE("742")"\n"
+"\t"STUB_ASM_CODE("756")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1sNV))"\n"
-"\t"STUB_ASM_CODE("743")"\n"
+"\t"STUB_ASM_CODE("757")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1svNV))"\n"
-"\t"STUB_ASM_CODE("744")"\n"
+"\t"STUB_ASM_CODE("758")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dNV))"\n"
-"\t"STUB_ASM_CODE("745")"\n"
+"\t"STUB_ASM_CODE("759")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dvNV))"\n"
-"\t"STUB_ASM_CODE("746")"\n"
+"\t"STUB_ASM_CODE("760")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fNV))"\n"
-"\t"STUB_ASM_CODE("747")"\n"
+"\t"STUB_ASM_CODE("761")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fvNV))"\n"
-"\t"STUB_ASM_CODE("748")"\n"
+"\t"STUB_ASM_CODE("762")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2sNV))"\n"
-"\t"STUB_ASM_CODE("749")"\n"
+"\t"STUB_ASM_CODE("763")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2svNV))"\n"
-"\t"STUB_ASM_CODE("750")"\n"
+"\t"STUB_ASM_CODE("764")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dNV))"\n"
-"\t"STUB_ASM_CODE("751")"\n"
+"\t"STUB_ASM_CODE("765")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dvNV))"\n"
-"\t"STUB_ASM_CODE("752")"\n"
+"\t"STUB_ASM_CODE("766")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fNV))"\n"
-"\t"STUB_ASM_CODE("753")"\n"
+"\t"STUB_ASM_CODE("767")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fvNV))"\n"
-"\t"STUB_ASM_CODE("754")"\n"
+"\t"STUB_ASM_CODE("768")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3sNV))"\n"
-"\t"STUB_ASM_CODE("755")"\n"
+"\t"STUB_ASM_CODE("769")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3svNV))"\n"
-"\t"STUB_ASM_CODE("756")"\n"
+"\t"STUB_ASM_CODE("770")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dNV))"\n"
-"\t"STUB_ASM_CODE("757")"\n"
+"\t"STUB_ASM_CODE("771")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dvNV))"\n"
-"\t"STUB_ASM_CODE("758")"\n"
+"\t"STUB_ASM_CODE("772")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fNV))"\n"
-"\t"STUB_ASM_CODE("759")"\n"
+"\t"STUB_ASM_CODE("773")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fvNV))"\n"
-"\t"STUB_ASM_CODE("760")"\n"
+"\t"STUB_ASM_CODE("774")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4sNV))"\n"
-"\t"STUB_ASM_CODE("761")"\n"
+"\t"STUB_ASM_CODE("775")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4svNV))"\n"
-"\t"STUB_ASM_CODE("762")"\n"
+"\t"STUB_ASM_CODE("776")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubNV))"\n"
-"\t"STUB_ASM_CODE("763")"\n"
+"\t"STUB_ASM_CODE("777")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubvNV))"\n"
-"\t"STUB_ASM_CODE("764")"\n"
+"\t"STUB_ASM_CODE("778")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribPointerNV))"\n"
-"\t"STUB_ASM_CODE("765")"\n"
+"\t"STUB_ASM_CODE("779")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1dvNV))"\n"
-"\t"STUB_ASM_CODE("766")"\n"
+"\t"STUB_ASM_CODE("780")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1fvNV))"\n"
-"\t"STUB_ASM_CODE("767")"\n"
+"\t"STUB_ASM_CODE("781")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1svNV))"\n"
-"\t"STUB_ASM_CODE("768")"\n"
+"\t"STUB_ASM_CODE("782")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2dvNV))"\n"
-"\t"STUB_ASM_CODE("769")"\n"
+"\t"STUB_ASM_CODE("783")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2fvNV))"\n"
-"\t"STUB_ASM_CODE("770")"\n"
+"\t"STUB_ASM_CODE("784")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2svNV))"\n"
-"\t"STUB_ASM_CODE("771")"\n"
+"\t"STUB_ASM_CODE("785")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3dvNV))"\n"
-"\t"STUB_ASM_CODE("772")"\n"
+"\t"STUB_ASM_CODE("786")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3fvNV))"\n"
-"\t"STUB_ASM_CODE("773")"\n"
+"\t"STUB_ASM_CODE("787")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3svNV))"\n"
-"\t"STUB_ASM_CODE("774")"\n"
+"\t"STUB_ASM_CODE("788")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4dvNV))"\n"
-"\t"STUB_ASM_CODE("775")"\n"
+"\t"STUB_ASM_CODE("789")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4fvNV))"\n"
-"\t"STUB_ASM_CODE("776")"\n"
+"\t"STUB_ASM_CODE("790")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4svNV))"\n"
-"\t"STUB_ASM_CODE("777")"\n"
+"\t"STUB_ASM_CODE("791")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4ubvNV))"\n"
-"\t"STUB_ASM_CODE("778")"\n"
+"\t"STUB_ASM_CODE("792")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("779")"\n"
+"\t"STUB_ASM_CODE("793")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("780")"\n"
+"\t"STUB_ASM_CODE("794")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("781")"\n"
+"\t"STUB_ASM_CODE("795")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("782")"\n"
+"\t"STUB_ASM_CODE("796")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("783")"\n"
+"\t"STUB_ASM_CODE("797")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("784")"\n"
+"\t"STUB_ASM_CODE("798")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("785")"\n"
+"\t"STUB_ASM_CODE("799")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("786")"\n"
+"\t"STUB_ASM_CODE("800")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("787")"\n"
+"\t"STUB_ASM_CODE("801")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("788")"\n"
+"\t"STUB_ASM_CODE("802")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("789")"\n"
+"\t"STUB_ASM_CODE("803")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("790")"\n"
+"\t"STUB_ASM_CODE("804")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("791")"\n"
+"\t"STUB_ASM_CODE("805")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("792")"\n"
+"\t"STUB_ASM_CODE("806")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFragmentShadersATI))"\n"
-"\t"STUB_ASM_CODE("793")"\n"
+"\t"STUB_ASM_CODE("807")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PassTexCoordATI))"\n"
-"\t"STUB_ASM_CODE("794")"\n"
+"\t"STUB_ASM_CODE("808")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SampleMapATI))"\n"
-"\t"STUB_ASM_CODE("795")"\n"
+"\t"STUB_ASM_CODE("809")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SetFragmentShaderConstantATI))"\n"
-"\t"STUB_ASM_CODE("796")"\n"
+"\t"STUB_ASM_CODE("810")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameteriNV))"\n"
-"\t"STUB_ASM_CODE("797")"\n"
+"\t"STUB_ASM_CODE("811")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteri)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteri)", "GLAPI_PREFIX_STR(PointParameteriNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterivNV))"\n"
-"\t"STUB_ASM_CODE("798")"\n"
+"\t"STUB_ASM_CODE("812")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteriv)", "GLAPI_PREFIX_STR(PointParameterivNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteVertexArrays))"\n"
-"\t"STUB_ASM_CODE("801")"\n"
+"\t"STUB_ASM_CODE("815")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsVertexArray))"\n"
-"\t"STUB_ASM_CODE("803")"\n"
+"\t"STUB_ASM_CODE("817")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("804")"\n"
+"\t"STUB_ASM_CODE("818")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("805")"\n"
+"\t"STUB_ASM_CODE("819")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dNV))"\n"
-"\t"STUB_ASM_CODE("806")"\n"
+"\t"STUB_ASM_CODE("820")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dvNV))"\n"
-"\t"STUB_ASM_CODE("807")"\n"
+"\t"STUB_ASM_CODE("821")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fNV))"\n"
-"\t"STUB_ASM_CODE("808")"\n"
+"\t"STUB_ASM_CODE("822")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fvNV))"\n"
-"\t"STUB_ASM_CODE("809")"\n"
+"\t"STUB_ASM_CODE("823")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartIndexNV))"\n"
-"\t"STUB_ASM_CODE("810")"\n"
+"\t"STUB_ASM_CODE("824")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PrimitiveRestartIndex)"\n"
 ".set "GLAPI_PREFIX_STR(PrimitiveRestartIndex)", "GLAPI_PREFIX_STR(PrimitiveRestartIndexNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartNV))"\n"
-"\t"STUB_ASM_CODE("811")"\n"
+"\t"STUB_ASM_CODE("825")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationSeparate))"\n"
-"\t"STUB_ASM_CODE("859")"\n"
+"\t"STUB_ASM_CODE("873")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("860")"\n"
+"\t"STUB_ASM_CODE("874")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindFramebuffer)", "GLAPI_PREFIX_STR(BindFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("861")"\n"
+"\t"STUB_ASM_CODE("875")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindRenderbuffer)", "GLAPI_PREFIX_STR(BindRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CheckFramebufferStatusEXT))"\n"
-"\t"STUB_ASM_CODE("862")"\n"
+"\t"STUB_ASM_CODE("876")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CheckFramebufferStatus)"\n"
 ".set "GLAPI_PREFIX_STR(CheckFramebufferStatus)", "GLAPI_PREFIX_STR(CheckFramebufferStatusEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("863")"\n"
+"\t"STUB_ASM_CODE("877")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteFramebuffers)", "GLAPI_PREFIX_STR(DeleteFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("864")"\n"
+"\t"STUB_ASM_CODE("878")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteRenderbuffers)", "GLAPI_PREFIX_STR(DeleteRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("865")"\n"
+"\t"STUB_ASM_CODE("879")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferRenderbuffer)", "GLAPI_PREFIX_STR(FramebufferRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture1DEXT))"\n"
-"\t"STUB_ASM_CODE("866")"\n"
+"\t"STUB_ASM_CODE("880")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture1D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture1D)", "GLAPI_PREFIX_STR(FramebufferTexture1DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture2DEXT))"\n"
-"\t"STUB_ASM_CODE("867")"\n"
+"\t"STUB_ASM_CODE("881")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture2D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture2D)", "GLAPI_PREFIX_STR(FramebufferTexture2DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture3DEXT))"\n"
-"\t"STUB_ASM_CODE("868")"\n"
+"\t"STUB_ASM_CODE("882")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture3D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture3D)", "GLAPI_PREFIX_STR(FramebufferTexture3DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("869")"\n"
+"\t"STUB_ASM_CODE("883")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenFramebuffers)", "GLAPI_PREFIX_STR(GenFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("870")"\n"
+"\t"STUB_ASM_CODE("884")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenRenderbuffers)", "GLAPI_PREFIX_STR(GenRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenerateMipmapEXT))"\n"
-"\t"STUB_ASM_CODE("871")"\n"
+"\t"STUB_ASM_CODE("885")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenerateMipmap)"\n"
 ".set "GLAPI_PREFIX_STR(GenerateMipmap)", "GLAPI_PREFIX_STR(GenerateMipmapEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("872")"\n"
+"\t"STUB_ASM_CODE("886")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)", "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("873")"\n"
+"\t"STUB_ASM_CODE("887")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)", "GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("874")"\n"
+"\t"STUB_ASM_CODE("888")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsFramebuffer)", "GLAPI_PREFIX_STR(IsFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("875")"\n"
+"\t"STUB_ASM_CODE("889")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsRenderbuffer)", "GLAPI_PREFIX_STR(IsRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RenderbufferStorageEXT))"\n"
-"\t"STUB_ASM_CODE("876")"\n"
+"\t"STUB_ASM_CODE("890")"\n"
 
 ".globl "GLAPI_PREFIX_STR(RenderbufferStorage)"\n"
 ".set "GLAPI_PREFIX_STR(RenderbufferStorage)", "GLAPI_PREFIX_STR(RenderbufferStorageEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlitFramebuffer))"\n"
-"\t"STUB_ASM_CODE("877")"\n"
+"\t"STUB_ASM_CODE("891")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("880")"\n"
+"\t"STUB_ASM_CODE("894")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(BindFragDataLocation)", "GLAPI_PREFIX_STR(BindFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("881")"\n"
+"\t"STUB_ASM_CODE("895")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(GetFragDataLocation)", "GLAPI_PREFIX_STR(GetFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformuivEXT))"\n"
-"\t"STUB_ASM_CODE("882")"\n"
+"\t"STUB_ASM_CODE("896")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformuiv)", "GLAPI_PREFIX_STR(GetUniformuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIivEXT))"\n"
-"\t"STUB_ASM_CODE("883")"\n"
+"\t"STUB_ASM_CODE("897")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIiv)", "GLAPI_PREFIX_STR(GetVertexAttribIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIuivEXT))"\n"
-"\t"STUB_ASM_CODE("884")"\n"
+"\t"STUB_ASM_CODE("898")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIuiv)", "GLAPI_PREFIX_STR(GetVertexAttribIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uiEXT))"\n"
-"\t"STUB_ASM_CODE("885")"\n"
+"\t"STUB_ASM_CODE("899")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1ui)", "GLAPI_PREFIX_STR(Uniform1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uivEXT))"\n"
-"\t"STUB_ASM_CODE("886")"\n"
+"\t"STUB_ASM_CODE("900")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1uiv)", "GLAPI_PREFIX_STR(Uniform1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uiEXT))"\n"
-"\t"STUB_ASM_CODE("887")"\n"
+"\t"STUB_ASM_CODE("901")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2ui)", "GLAPI_PREFIX_STR(Uniform2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uivEXT))"\n"
-"\t"STUB_ASM_CODE("888")"\n"
+"\t"STUB_ASM_CODE("902")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2uiv)", "GLAPI_PREFIX_STR(Uniform2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uiEXT))"\n"
-"\t"STUB_ASM_CODE("889")"\n"
+"\t"STUB_ASM_CODE("903")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3ui)", "GLAPI_PREFIX_STR(Uniform3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uivEXT))"\n"
-"\t"STUB_ASM_CODE("890")"\n"
+"\t"STUB_ASM_CODE("904")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3uiv)", "GLAPI_PREFIX_STR(Uniform3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uiEXT))"\n"
-"\t"STUB_ASM_CODE("891")"\n"
+"\t"STUB_ASM_CODE("905")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4ui)", "GLAPI_PREFIX_STR(Uniform4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uivEXT))"\n"
-"\t"STUB_ASM_CODE("892")"\n"
+"\t"STUB_ASM_CODE("906")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4uiv)", "GLAPI_PREFIX_STR(Uniform4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1iEXT))"\n"
-"\t"STUB_ASM_CODE("893")"\n"
+"\t"STUB_ASM_CODE("907")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1i)", "GLAPI_PREFIX_STR(VertexAttribI1iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1ivEXT))"\n"
-"\t"STUB_ASM_CODE("894")"\n"
+"\t"STUB_ASM_CODE("908")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1iv)", "GLAPI_PREFIX_STR(VertexAttribI1ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uiEXT))"\n"
-"\t"STUB_ASM_CODE("895")"\n"
+"\t"STUB_ASM_CODE("909")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1ui)", "GLAPI_PREFIX_STR(VertexAttribI1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uivEXT))"\n"
-"\t"STUB_ASM_CODE("896")"\n"
+"\t"STUB_ASM_CODE("910")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1uiv)", "GLAPI_PREFIX_STR(VertexAttribI1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2iEXT))"\n"
-"\t"STUB_ASM_CODE("897")"\n"
+"\t"STUB_ASM_CODE("911")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2i)", "GLAPI_PREFIX_STR(VertexAttribI2iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2ivEXT))"\n"
-"\t"STUB_ASM_CODE("898")"\n"
+"\t"STUB_ASM_CODE("912")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2iv)", "GLAPI_PREFIX_STR(VertexAttribI2ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uiEXT))"\n"
-"\t"STUB_ASM_CODE("899")"\n"
+"\t"STUB_ASM_CODE("913")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2ui)", "GLAPI_PREFIX_STR(VertexAttribI2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uivEXT))"\n"
-"\t"STUB_ASM_CODE("900")"\n"
+"\t"STUB_ASM_CODE("914")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2uiv)", "GLAPI_PREFIX_STR(VertexAttribI2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3iEXT))"\n"
-"\t"STUB_ASM_CODE("901")"\n"
+"\t"STUB_ASM_CODE("915")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3i)", "GLAPI_PREFIX_STR(VertexAttribI3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3ivEXT))"\n"
-"\t"STUB_ASM_CODE("902")"\n"
+"\t"STUB_ASM_CODE("916")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3iv)", "GLAPI_PREFIX_STR(VertexAttribI3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uiEXT))"\n"
-"\t"STUB_ASM_CODE("903")"\n"
+"\t"STUB_ASM_CODE("917")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3ui)", "GLAPI_PREFIX_STR(VertexAttribI3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uivEXT))"\n"
-"\t"STUB_ASM_CODE("904")"\n"
+"\t"STUB_ASM_CODE("918")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3uiv)", "GLAPI_PREFIX_STR(VertexAttribI3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4bvEXT))"\n"
-"\t"STUB_ASM_CODE("905")"\n"
+"\t"STUB_ASM_CODE("919")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4bv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4bv)", "GLAPI_PREFIX_STR(VertexAttribI4bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4iEXT))"\n"
-"\t"STUB_ASM_CODE("906")"\n"
+"\t"STUB_ASM_CODE("920")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4i)", "GLAPI_PREFIX_STR(VertexAttribI4iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ivEXT))"\n"
-"\t"STUB_ASM_CODE("907")"\n"
+"\t"STUB_ASM_CODE("921")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4iv)", "GLAPI_PREFIX_STR(VertexAttribI4ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4svEXT))"\n"
-"\t"STUB_ASM_CODE("908")"\n"
+"\t"STUB_ASM_CODE("922")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4sv)", "GLAPI_PREFIX_STR(VertexAttribI4svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ubvEXT))"\n"
-"\t"STUB_ASM_CODE("909")"\n"
+"\t"STUB_ASM_CODE("923")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ubv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ubv)", "GLAPI_PREFIX_STR(VertexAttribI4ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uiEXT))"\n"
-"\t"STUB_ASM_CODE("910")"\n"
+"\t"STUB_ASM_CODE("924")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ui)", "GLAPI_PREFIX_STR(VertexAttribI4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uivEXT))"\n"
-"\t"STUB_ASM_CODE("911")"\n"
+"\t"STUB_ASM_CODE("925")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4uiv)", "GLAPI_PREFIX_STR(VertexAttribI4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4usvEXT))"\n"
-"\t"STUB_ASM_CODE("912")"\n"
+"\t"STUB_ASM_CODE("926")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4usv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4usv)", "GLAPI_PREFIX_STR(VertexAttribI4usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribIPointerEXT))"\n"
-"\t"STUB_ASM_CODE("913")"\n"
+"\t"STUB_ASM_CODE("927")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribIPointer)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribIPointer)", "GLAPI_PREFIX_STR(VertexAttribIPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureLayerEXT))"\n"
-"\t"STUB_ASM_CODE("914")"\n"
+"\t"STUB_ASM_CODE("928")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTextureLayer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayer)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorMaskIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("915")"\n"
+"\t"STUB_ASM_CODE("929")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ColorMaski)"\n"
 ".set "GLAPI_PREFIX_STR(ColorMaski)", "GLAPI_PREFIX_STR(ColorMaskIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DisableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("916")"\n"
+"\t"STUB_ASM_CODE("930")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Disablei)"\n"
 ".set "GLAPI_PREFIX_STR(Disablei)", "GLAPI_PREFIX_STR(DisableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EnableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("917")"\n"
+"\t"STUB_ASM_CODE("931")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Enablei)"\n"
 ".set "GLAPI_PREFIX_STR(Enablei)", "GLAPI_PREFIX_STR(EnableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBooleanIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("918")"\n"
+"\t"STUB_ASM_CODE("932")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBooleani_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetBooleani_v)", "GLAPI_PREFIX_STR(GetBooleanIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetIntegerIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("919")"\n"
+"\t"STUB_ASM_CODE("933")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetIntegeri_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetIntegeri_v)", "GLAPI_PREFIX_STR(GetIntegerIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsEnabledIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("920")"\n"
+"\t"STUB_ASM_CODE("934")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsEnabledi)"\n"
 ".set "GLAPI_PREFIX_STR(IsEnabledi)", "GLAPI_PREFIX_STR(IsEnabledIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIiEXT))"\n"
-"\t"STUB_ASM_CODE("921")"\n"
+"\t"STUB_ASM_CODE("935")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIuiEXT))"\n"
-"\t"STUB_ASM_CODE("922")"\n"
+"\t"STUB_ASM_CODE("936")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("923")"\n"
+"\t"STUB_ASM_CODE("937")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIiv)", "GLAPI_PREFIX_STR(GetTexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("924")"\n"
+"\t"STUB_ASM_CODE("938")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIuiv)", "GLAPI_PREFIX_STR(GetTexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("925")"\n"
+"\t"STUB_ASM_CODE("939")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIiv)", "GLAPI_PREFIX_STR(TexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("926")"\n"
+"\t"STUB_ASM_CODE("940")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIuiv)", "GLAPI_PREFIX_STR(TexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("927")"\n"
+"\t"STUB_ASM_CODE("941")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(BeginConditionalRender)", "GLAPI_PREFIX_STR(BeginConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("928")"\n"
+"\t"STUB_ASM_CODE("942")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(EndConditionalRender)", "GLAPI_PREFIX_STR(EndConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("929")"\n"
+"\t"STUB_ASM_CODE("943")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(BeginTransformFeedback)", "GLAPI_PREFIX_STR(BeginTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferBaseEXT))"\n"
-"\t"STUB_ASM_CODE("930")"\n"
+"\t"STUB_ASM_CODE("944")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferBase)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferBase)", "GLAPI_PREFIX_STR(BindBufferBaseEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferOffsetEXT))"\n"
-"\t"STUB_ASM_CODE("931")"\n"
+"\t"STUB_ASM_CODE("945")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferRangeEXT))"\n"
-"\t"STUB_ASM_CODE("932")"\n"
+"\t"STUB_ASM_CODE("946")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferRange)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferRange)", "GLAPI_PREFIX_STR(BindBufferRangeEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("933")"\n"
+"\t"STUB_ASM_CODE("947")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(EndTransformFeedback)", "GLAPI_PREFIX_STR(EndTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT))"\n"
-"\t"STUB_ASM_CODE("934")"\n"
+"\t"STUB_ASM_CODE("948")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)"\n"
 ".set "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)", "GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT))"\n"
-"\t"STUB_ASM_CODE("935")"\n"
+"\t"STUB_ASM_CODE("949")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TransformFeedbackVaryings)"\n"
 ".set "GLAPI_PREFIX_STR(TransformFeedbackVaryings)", "GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProvokingVertexEXT))"\n"
-"\t"STUB_ASM_CODE("936")"\n"
+"\t"STUB_ASM_CODE("950")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProvokingVertex)"\n"
 ".set "GLAPI_PREFIX_STR(ProvokingVertex)", "GLAPI_PREFIX_STR(ProvokingVertexEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetObjectParameterivAPPLE))"\n"
-"\t"STUB_ASM_CODE("939")"\n"
+"\t"STUB_ASM_CODE("953")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectPurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("940")"\n"
+"\t"STUB_ASM_CODE("954")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectUnpurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("941")"\n"
+"\t"STUB_ASM_CODE("955")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ActiveProgramEXT))"\n"
-"\t"STUB_ASM_CODE("942")"\n"
+"\t"STUB_ASM_CODE("956")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("943")"\n"
+"\t"STUB_ASM_CODE("957")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UseShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("944")"\n"
+"\t"STUB_ASM_CODE("958")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureBarrierNV))"\n"
-"\t"STUB_ASM_CODE("945")"\n"
+"\t"STUB_ASM_CODE("959")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetRenderbufferStorageOES))"\n"
-"\t"STUB_ASM_CODE("951")"\n"
+"\t"STUB_ASM_CODE("965")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetTexture2DOES))"\n"
-"\t"STUB_ASM_CODE("952")"\n"
+"\t"STUB_ASM_CODE("966")"\n"
 
 );
 #undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN
diff --git a/src/mapi/glapi/glapi_sparc.S b/src/mapi/glapi/glapi_sparc.S
index edbce937165..f62e1258b4e 100644
--- a/src/mapi/glapi/glapi_sparc.S
+++ b/src/mapi/glapi/glapi_sparc.S
@@ -795,335 +795,349 @@ gl_dispatch_functions_start:
 	GL_STUB(glBlendEquationiARB, 597)
 	GL_STUB(glBlendFuncSeparateiARB, 598)
 	GL_STUB(glBlendFunciARB, 599)
-	GL_STUB(glBindTransformFeedback, 600)
-	GL_STUB(glDeleteTransformFeedbacks, 601)
-	GL_STUB(glDrawTransformFeedback, 602)
-	GL_STUB(glGenTransformFeedbacks, 603)
-	GL_STUB(glIsTransformFeedback, 604)
-	GL_STUB(glPauseTransformFeedback, 605)
-	GL_STUB(glResumeTransformFeedback, 606)
-	GL_STUB(glClearDepthf, 607)
-	GL_STUB(glDepthRangef, 608)
-	GL_STUB(glGetShaderPrecisionFormat, 609)
-	GL_STUB(glReleaseShaderCompiler, 610)
-	GL_STUB(glShaderBinary, 611)
-	GL_STUB(glPolygonOffsetEXT, 612)
-	GL_STUB(gl_dispatch_stub_613, 613)
-	HIDDEN(gl_dispatch_stub_613)
-	GL_STUB(gl_dispatch_stub_614, 614)
-	HIDDEN(gl_dispatch_stub_614)
-	GL_STUB(gl_dispatch_stub_615, 615)
-	HIDDEN(gl_dispatch_stub_615)
-	GL_STUB(gl_dispatch_stub_616, 616)
-	HIDDEN(gl_dispatch_stub_616)
-	GL_STUB(gl_dispatch_stub_617, 617)
-	HIDDEN(gl_dispatch_stub_617)
-	GL_STUB(gl_dispatch_stub_618, 618)
-	HIDDEN(gl_dispatch_stub_618)
-	GL_STUB(gl_dispatch_stub_619, 619)
-	HIDDEN(gl_dispatch_stub_619)
-	GL_STUB(gl_dispatch_stub_620, 620)
-	HIDDEN(gl_dispatch_stub_620)
-	GL_STUB(glColorPointerEXT, 621)
-	GL_STUB(glEdgeFlagPointerEXT, 622)
-	GL_STUB(glIndexPointerEXT, 623)
-	GL_STUB(glNormalPointerEXT, 624)
-	GL_STUB(glTexCoordPointerEXT, 625)
-	GL_STUB(glVertexPointerEXT, 626)
-	GL_STUB(glPointParameterfEXT, 627)
-	GL_STUB(glPointParameterfvEXT, 628)
-	GL_STUB(glLockArraysEXT, 629)
-	GL_STUB(glUnlockArraysEXT, 630)
-	GL_STUB(glSecondaryColor3bEXT, 631)
-	GL_STUB(glSecondaryColor3bvEXT, 632)
-	GL_STUB(glSecondaryColor3dEXT, 633)
-	GL_STUB(glSecondaryColor3dvEXT, 634)
-	GL_STUB(glSecondaryColor3fEXT, 635)
-	GL_STUB(glSecondaryColor3fvEXT, 636)
-	GL_STUB(glSecondaryColor3iEXT, 637)
-	GL_STUB(glSecondaryColor3ivEXT, 638)
-	GL_STUB(glSecondaryColor3sEXT, 639)
-	GL_STUB(glSecondaryColor3svEXT, 640)
-	GL_STUB(glSecondaryColor3ubEXT, 641)
-	GL_STUB(glSecondaryColor3ubvEXT, 642)
-	GL_STUB(glSecondaryColor3uiEXT, 643)
-	GL_STUB(glSecondaryColor3uivEXT, 644)
-	GL_STUB(glSecondaryColor3usEXT, 645)
-	GL_STUB(glSecondaryColor3usvEXT, 646)
-	GL_STUB(glSecondaryColorPointerEXT, 647)
-	GL_STUB(glMultiDrawArraysEXT, 648)
-	GL_STUB(glMultiDrawElementsEXT, 649)
-	GL_STUB(glFogCoordPointerEXT, 650)
-	GL_STUB(glFogCoorddEXT, 651)
-	GL_STUB(glFogCoorddvEXT, 652)
-	GL_STUB(glFogCoordfEXT, 653)
-	GL_STUB(glFogCoordfvEXT, 654)
-	GL_STUB(gl_dispatch_stub_655, 655)
-	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(glBlendFuncSeparateEXT, 656)
-	GL_STUB(glFlushVertexArrayRangeNV, 657)
-	GL_STUB(glVertexArrayRangeNV, 658)
-	GL_STUB(glCombinerInputNV, 659)
-	GL_STUB(glCombinerOutputNV, 660)
-	GL_STUB(glCombinerParameterfNV, 661)
-	GL_STUB(glCombinerParameterfvNV, 662)
-	GL_STUB(glCombinerParameteriNV, 663)
-	GL_STUB(glCombinerParameterivNV, 664)
-	GL_STUB(glFinalCombinerInputNV, 665)
-	GL_STUB(glGetCombinerInputParameterfvNV, 666)
-	GL_STUB(glGetCombinerInputParameterivNV, 667)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 668)
-	GL_STUB(glGetCombinerOutputParameterivNV, 669)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 670)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 671)
-	GL_STUB(glResizeBuffersMESA, 672)
-	GL_STUB(glWindowPos2dMESA, 673)
-	GL_STUB(glWindowPos2dvMESA, 674)
-	GL_STUB(glWindowPos2fMESA, 675)
-	GL_STUB(glWindowPos2fvMESA, 676)
-	GL_STUB(glWindowPos2iMESA, 677)
-	GL_STUB(glWindowPos2ivMESA, 678)
-	GL_STUB(glWindowPos2sMESA, 679)
-	GL_STUB(glWindowPos2svMESA, 680)
-	GL_STUB(glWindowPos3dMESA, 681)
-	GL_STUB(glWindowPos3dvMESA, 682)
-	GL_STUB(glWindowPos3fMESA, 683)
-	GL_STUB(glWindowPos3fvMESA, 684)
-	GL_STUB(glWindowPos3iMESA, 685)
-	GL_STUB(glWindowPos3ivMESA, 686)
-	GL_STUB(glWindowPos3sMESA, 687)
-	GL_STUB(glWindowPos3svMESA, 688)
-	GL_STUB(glWindowPos4dMESA, 689)
-	GL_STUB(glWindowPos4dvMESA, 690)
-	GL_STUB(glWindowPos4fMESA, 691)
-	GL_STUB(glWindowPos4fvMESA, 692)
-	GL_STUB(glWindowPos4iMESA, 693)
-	GL_STUB(glWindowPos4ivMESA, 694)
-	GL_STUB(glWindowPos4sMESA, 695)
-	GL_STUB(glWindowPos4svMESA, 696)
-	GL_STUB(gl_dispatch_stub_697, 697)
-	HIDDEN(gl_dispatch_stub_697)
-	GL_STUB(gl_dispatch_stub_698, 698)
-	HIDDEN(gl_dispatch_stub_698)
-	GL_STUB(gl_dispatch_stub_699, 699)
-	HIDDEN(gl_dispatch_stub_699)
-	GL_STUB(gl_dispatch_stub_700, 700)
-	HIDDEN(gl_dispatch_stub_700)
-	GL_STUB(gl_dispatch_stub_701, 701)
-	HIDDEN(gl_dispatch_stub_701)
-	GL_STUB(gl_dispatch_stub_702, 702)
-	HIDDEN(gl_dispatch_stub_702)
-	GL_STUB(gl_dispatch_stub_703, 703)
-	HIDDEN(gl_dispatch_stub_703)
-	GL_STUB(gl_dispatch_stub_704, 704)
-	HIDDEN(gl_dispatch_stub_704)
-	GL_STUB(gl_dispatch_stub_705, 705)
-	HIDDEN(gl_dispatch_stub_705)
-	GL_STUB(glAreProgramsResidentNV, 706)
-	GL_STUB(glBindProgramNV, 707)
-	GL_STUB(glDeleteProgramsNV, 708)
-	GL_STUB(glExecuteProgramNV, 709)
-	GL_STUB(glGenProgramsNV, 710)
-	GL_STUB(glGetProgramParameterdvNV, 711)
-	GL_STUB(glGetProgramParameterfvNV, 712)
-	GL_STUB(glGetProgramStringNV, 713)
-	GL_STUB(glGetProgramivNV, 714)
-	GL_STUB(glGetTrackMatrixivNV, 715)
-	GL_STUB(glGetVertexAttribPointervNV, 716)
-	GL_STUB(glGetVertexAttribdvNV, 717)
-	GL_STUB(glGetVertexAttribfvNV, 718)
-	GL_STUB(glGetVertexAttribivNV, 719)
-	GL_STUB(glIsProgramNV, 720)
-	GL_STUB(glLoadProgramNV, 721)
-	GL_STUB(glProgramParameters4dvNV, 722)
-	GL_STUB(glProgramParameters4fvNV, 723)
-	GL_STUB(glRequestResidentProgramsNV, 724)
-	GL_STUB(glTrackMatrixNV, 725)
-	GL_STUB(glVertexAttrib1dNV, 726)
-	GL_STUB(glVertexAttrib1dvNV, 727)
-	GL_STUB(glVertexAttrib1fNV, 728)
-	GL_STUB(glVertexAttrib1fvNV, 729)
-	GL_STUB(glVertexAttrib1sNV, 730)
-	GL_STUB(glVertexAttrib1svNV, 731)
-	GL_STUB(glVertexAttrib2dNV, 732)
-	GL_STUB(glVertexAttrib2dvNV, 733)
-	GL_STUB(glVertexAttrib2fNV, 734)
-	GL_STUB(glVertexAttrib2fvNV, 735)
-	GL_STUB(glVertexAttrib2sNV, 736)
-	GL_STUB(glVertexAttrib2svNV, 737)
-	GL_STUB(glVertexAttrib3dNV, 738)
-	GL_STUB(glVertexAttrib3dvNV, 739)
-	GL_STUB(glVertexAttrib3fNV, 740)
-	GL_STUB(glVertexAttrib3fvNV, 741)
-	GL_STUB(glVertexAttrib3sNV, 742)
-	GL_STUB(glVertexAttrib3svNV, 743)
-	GL_STUB(glVertexAttrib4dNV, 744)
-	GL_STUB(glVertexAttrib4dvNV, 745)
-	GL_STUB(glVertexAttrib4fNV, 746)
-	GL_STUB(glVertexAttrib4fvNV, 747)
-	GL_STUB(glVertexAttrib4sNV, 748)
-	GL_STUB(glVertexAttrib4svNV, 749)
-	GL_STUB(glVertexAttrib4ubNV, 750)
-	GL_STUB(glVertexAttrib4ubvNV, 751)
-	GL_STUB(glVertexAttribPointerNV, 752)
-	GL_STUB(glVertexAttribs1dvNV, 753)
-	GL_STUB(glVertexAttribs1fvNV, 754)
-	GL_STUB(glVertexAttribs1svNV, 755)
-	GL_STUB(glVertexAttribs2dvNV, 756)
-	GL_STUB(glVertexAttribs2fvNV, 757)
-	GL_STUB(glVertexAttribs2svNV, 758)
-	GL_STUB(glVertexAttribs3dvNV, 759)
-	GL_STUB(glVertexAttribs3fvNV, 760)
-	GL_STUB(glVertexAttribs3svNV, 761)
-	GL_STUB(glVertexAttribs4dvNV, 762)
-	GL_STUB(glVertexAttribs4fvNV, 763)
-	GL_STUB(glVertexAttribs4svNV, 764)
-	GL_STUB(glVertexAttribs4ubvNV, 765)
-	GL_STUB(glGetTexBumpParameterfvATI, 766)
-	GL_STUB(glGetTexBumpParameterivATI, 767)
-	GL_STUB(glTexBumpParameterfvATI, 768)
-	GL_STUB(glTexBumpParameterivATI, 769)
-	GL_STUB(glAlphaFragmentOp1ATI, 770)
-	GL_STUB(glAlphaFragmentOp2ATI, 771)
-	GL_STUB(glAlphaFragmentOp3ATI, 772)
-	GL_STUB(glBeginFragmentShaderATI, 773)
-	GL_STUB(glBindFragmentShaderATI, 774)
-	GL_STUB(glColorFragmentOp1ATI, 775)
-	GL_STUB(glColorFragmentOp2ATI, 776)
-	GL_STUB(glColorFragmentOp3ATI, 777)
-	GL_STUB(glDeleteFragmentShaderATI, 778)
-	GL_STUB(glEndFragmentShaderATI, 779)
-	GL_STUB(glGenFragmentShadersATI, 780)
-	GL_STUB(glPassTexCoordATI, 781)
-	GL_STUB(glSampleMapATI, 782)
-	GL_STUB(glSetFragmentShaderConstantATI, 783)
-	GL_STUB(glPointParameteriNV, 784)
-	GL_STUB(glPointParameterivNV, 785)
-	GL_STUB(gl_dispatch_stub_786, 786)
-	HIDDEN(gl_dispatch_stub_786)
-	GL_STUB(gl_dispatch_stub_787, 787)
-	HIDDEN(gl_dispatch_stub_787)
-	GL_STUB(gl_dispatch_stub_788, 788)
-	HIDDEN(gl_dispatch_stub_788)
-	GL_STUB(gl_dispatch_stub_789, 789)
-	HIDDEN(gl_dispatch_stub_789)
-	GL_STUB(gl_dispatch_stub_790, 790)
-	HIDDEN(gl_dispatch_stub_790)
-	GL_STUB(glGetProgramNamedParameterdvNV, 791)
-	GL_STUB(glGetProgramNamedParameterfvNV, 792)
-	GL_STUB(glProgramNamedParameter4dNV, 793)
-	GL_STUB(glProgramNamedParameter4dvNV, 794)
-	GL_STUB(glProgramNamedParameter4fNV, 795)
-	GL_STUB(glProgramNamedParameter4fvNV, 796)
-	GL_STUB(glPrimitiveRestartIndexNV, 797)
-	GL_STUB(glPrimitiveRestartNV, 798)
-	GL_STUB(gl_dispatch_stub_799, 799)
-	HIDDEN(gl_dispatch_stub_799)
+	GL_STUB(glBindSampler, 600)
+	GL_STUB(glDeleteSamplers, 601)
+	GL_STUB(glGenSamplers, 602)
+	GL_STUB(glGetSamplerParameterIiv, 603)
+	GL_STUB(glGetSamplerParameterIuiv, 604)
+	GL_STUB(glGetSamplerParameterfv, 605)
+	GL_STUB(glGetSamplerParameteriv, 606)
+	GL_STUB(glIsSampler, 607)
+	GL_STUB(glSamplerParameterIiv, 608)
+	GL_STUB(glSamplerParameterIuiv, 609)
+	GL_STUB(glSamplerParameterf, 610)
+	GL_STUB(glSamplerParameterfv, 611)
+	GL_STUB(glSamplerParameteri, 612)
+	GL_STUB(glSamplerParameteriv, 613)
+	GL_STUB(glBindTransformFeedback, 614)
+	GL_STUB(glDeleteTransformFeedbacks, 615)
+	GL_STUB(glDrawTransformFeedback, 616)
+	GL_STUB(glGenTransformFeedbacks, 617)
+	GL_STUB(glIsTransformFeedback, 618)
+	GL_STUB(glPauseTransformFeedback, 619)
+	GL_STUB(glResumeTransformFeedback, 620)
+	GL_STUB(glClearDepthf, 621)
+	GL_STUB(glDepthRangef, 622)
+	GL_STUB(glGetShaderPrecisionFormat, 623)
+	GL_STUB(glReleaseShaderCompiler, 624)
+	GL_STUB(glShaderBinary, 625)
+	GL_STUB(glPolygonOffsetEXT, 626)
+	GL_STUB(gl_dispatch_stub_627, 627)
+	HIDDEN(gl_dispatch_stub_627)
+	GL_STUB(gl_dispatch_stub_628, 628)
+	HIDDEN(gl_dispatch_stub_628)
+	GL_STUB(gl_dispatch_stub_629, 629)
+	HIDDEN(gl_dispatch_stub_629)
+	GL_STUB(gl_dispatch_stub_630, 630)
+	HIDDEN(gl_dispatch_stub_630)
+	GL_STUB(gl_dispatch_stub_631, 631)
+	HIDDEN(gl_dispatch_stub_631)
+	GL_STUB(gl_dispatch_stub_632, 632)
+	HIDDEN(gl_dispatch_stub_632)
+	GL_STUB(gl_dispatch_stub_633, 633)
+	HIDDEN(gl_dispatch_stub_633)
+	GL_STUB(gl_dispatch_stub_634, 634)
+	HIDDEN(gl_dispatch_stub_634)
+	GL_STUB(glColorPointerEXT, 635)
+	GL_STUB(glEdgeFlagPointerEXT, 636)
+	GL_STUB(glIndexPointerEXT, 637)
+	GL_STUB(glNormalPointerEXT, 638)
+	GL_STUB(glTexCoordPointerEXT, 639)
+	GL_STUB(glVertexPointerEXT, 640)
+	GL_STUB(glPointParameterfEXT, 641)
+	GL_STUB(glPointParameterfvEXT, 642)
+	GL_STUB(glLockArraysEXT, 643)
+	GL_STUB(glUnlockArraysEXT, 644)
+	GL_STUB(glSecondaryColor3bEXT, 645)
+	GL_STUB(glSecondaryColor3bvEXT, 646)
+	GL_STUB(glSecondaryColor3dEXT, 647)
+	GL_STUB(glSecondaryColor3dvEXT, 648)
+	GL_STUB(glSecondaryColor3fEXT, 649)
+	GL_STUB(glSecondaryColor3fvEXT, 650)
+	GL_STUB(glSecondaryColor3iEXT, 651)
+	GL_STUB(glSecondaryColor3ivEXT, 652)
+	GL_STUB(glSecondaryColor3sEXT, 653)
+	GL_STUB(glSecondaryColor3svEXT, 654)
+	GL_STUB(glSecondaryColor3ubEXT, 655)
+	GL_STUB(glSecondaryColor3ubvEXT, 656)
+	GL_STUB(glSecondaryColor3uiEXT, 657)
+	GL_STUB(glSecondaryColor3uivEXT, 658)
+	GL_STUB(glSecondaryColor3usEXT, 659)
+	GL_STUB(glSecondaryColor3usvEXT, 660)
+	GL_STUB(glSecondaryColorPointerEXT, 661)
+	GL_STUB(glMultiDrawArraysEXT, 662)
+	GL_STUB(glMultiDrawElementsEXT, 663)
+	GL_STUB(glFogCoordPointerEXT, 664)
+	GL_STUB(glFogCoorddEXT, 665)
+	GL_STUB(glFogCoorddvEXT, 666)
+	GL_STUB(glFogCoordfEXT, 667)
+	GL_STUB(glFogCoordfvEXT, 668)
+	GL_STUB(gl_dispatch_stub_669, 669)
+	HIDDEN(gl_dispatch_stub_669)
+	GL_STUB(glBlendFuncSeparateEXT, 670)
+	GL_STUB(glFlushVertexArrayRangeNV, 671)
+	GL_STUB(glVertexArrayRangeNV, 672)
+	GL_STUB(glCombinerInputNV, 673)
+	GL_STUB(glCombinerOutputNV, 674)
+	GL_STUB(glCombinerParameterfNV, 675)
+	GL_STUB(glCombinerParameterfvNV, 676)
+	GL_STUB(glCombinerParameteriNV, 677)
+	GL_STUB(glCombinerParameterivNV, 678)
+	GL_STUB(glFinalCombinerInputNV, 679)
+	GL_STUB(glGetCombinerInputParameterfvNV, 680)
+	GL_STUB(glGetCombinerInputParameterivNV, 681)
+	GL_STUB(glGetCombinerOutputParameterfvNV, 682)
+	GL_STUB(glGetCombinerOutputParameterivNV, 683)
+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 684)
+	GL_STUB(glGetFinalCombinerInputParameterivNV, 685)
+	GL_STUB(glResizeBuffersMESA, 686)
+	GL_STUB(glWindowPos2dMESA, 687)
+	GL_STUB(glWindowPos2dvMESA, 688)
+	GL_STUB(glWindowPos2fMESA, 689)
+	GL_STUB(glWindowPos2fvMESA, 690)
+	GL_STUB(glWindowPos2iMESA, 691)
+	GL_STUB(glWindowPos2ivMESA, 692)
+	GL_STUB(glWindowPos2sMESA, 693)
+	GL_STUB(glWindowPos2svMESA, 694)
+	GL_STUB(glWindowPos3dMESA, 695)
+	GL_STUB(glWindowPos3dvMESA, 696)
+	GL_STUB(glWindowPos3fMESA, 697)
+	GL_STUB(glWindowPos3fvMESA, 698)
+	GL_STUB(glWindowPos3iMESA, 699)
+	GL_STUB(glWindowPos3ivMESA, 700)
+	GL_STUB(glWindowPos3sMESA, 701)
+	GL_STUB(glWindowPos3svMESA, 702)
+	GL_STUB(glWindowPos4dMESA, 703)
+	GL_STUB(glWindowPos4dvMESA, 704)
+	GL_STUB(glWindowPos4fMESA, 705)
+	GL_STUB(glWindowPos4fvMESA, 706)
+	GL_STUB(glWindowPos4iMESA, 707)
+	GL_STUB(glWindowPos4ivMESA, 708)
+	GL_STUB(glWindowPos4sMESA, 709)
+	GL_STUB(glWindowPos4svMESA, 710)
+	GL_STUB(gl_dispatch_stub_711, 711)
+	HIDDEN(gl_dispatch_stub_711)
+	GL_STUB(gl_dispatch_stub_712, 712)
+	HIDDEN(gl_dispatch_stub_712)
+	GL_STUB(gl_dispatch_stub_713, 713)
+	HIDDEN(gl_dispatch_stub_713)
+	GL_STUB(gl_dispatch_stub_714, 714)
+	HIDDEN(gl_dispatch_stub_714)
+	GL_STUB(gl_dispatch_stub_715, 715)
+	HIDDEN(gl_dispatch_stub_715)
+	GL_STUB(gl_dispatch_stub_716, 716)
+	HIDDEN(gl_dispatch_stub_716)
+	GL_STUB(gl_dispatch_stub_717, 717)
+	HIDDEN(gl_dispatch_stub_717)
+	GL_STUB(gl_dispatch_stub_718, 718)
+	HIDDEN(gl_dispatch_stub_718)
+	GL_STUB(gl_dispatch_stub_719, 719)
+	HIDDEN(gl_dispatch_stub_719)
+	GL_STUB(glAreProgramsResidentNV, 720)
+	GL_STUB(glBindProgramNV, 721)
+	GL_STUB(glDeleteProgramsNV, 722)
+	GL_STUB(glExecuteProgramNV, 723)
+	GL_STUB(glGenProgramsNV, 724)
+	GL_STUB(glGetProgramParameterdvNV, 725)
+	GL_STUB(glGetProgramParameterfvNV, 726)
+	GL_STUB(glGetProgramStringNV, 727)
+	GL_STUB(glGetProgramivNV, 728)
+	GL_STUB(glGetTrackMatrixivNV, 729)
+	GL_STUB(glGetVertexAttribPointervNV, 730)
+	GL_STUB(glGetVertexAttribdvNV, 731)
+	GL_STUB(glGetVertexAttribfvNV, 732)
+	GL_STUB(glGetVertexAttribivNV, 733)
+	GL_STUB(glIsProgramNV, 734)
+	GL_STUB(glLoadProgramNV, 735)
+	GL_STUB(glProgramParameters4dvNV, 736)
+	GL_STUB(glProgramParameters4fvNV, 737)
+	GL_STUB(glRequestResidentProgramsNV, 738)
+	GL_STUB(glTrackMatrixNV, 739)
+	GL_STUB(glVertexAttrib1dNV, 740)
+	GL_STUB(glVertexAttrib1dvNV, 741)
+	GL_STUB(glVertexAttrib1fNV, 742)
+	GL_STUB(glVertexAttrib1fvNV, 743)
+	GL_STUB(glVertexAttrib1sNV, 744)
+	GL_STUB(glVertexAttrib1svNV, 745)
+	GL_STUB(glVertexAttrib2dNV, 746)
+	GL_STUB(glVertexAttrib2dvNV, 747)
+	GL_STUB(glVertexAttrib2fNV, 748)
+	GL_STUB(glVertexAttrib2fvNV, 749)
+	GL_STUB(glVertexAttrib2sNV, 750)
+	GL_STUB(glVertexAttrib2svNV, 751)
+	GL_STUB(glVertexAttrib3dNV, 752)
+	GL_STUB(glVertexAttrib3dvNV, 753)
+	GL_STUB(glVertexAttrib3fNV, 754)
+	GL_STUB(glVertexAttrib3fvNV, 755)
+	GL_STUB(glVertexAttrib3sNV, 756)
+	GL_STUB(glVertexAttrib3svNV, 757)
+	GL_STUB(glVertexAttrib4dNV, 758)
+	GL_STUB(glVertexAttrib4dvNV, 759)
+	GL_STUB(glVertexAttrib4fNV, 760)
+	GL_STUB(glVertexAttrib4fvNV, 761)
+	GL_STUB(glVertexAttrib4sNV, 762)
+	GL_STUB(glVertexAttrib4svNV, 763)
+	GL_STUB(glVertexAttrib4ubNV, 764)
+	GL_STUB(glVertexAttrib4ubvNV, 765)
+	GL_STUB(glVertexAttribPointerNV, 766)
+	GL_STUB(glVertexAttribs1dvNV, 767)
+	GL_STUB(glVertexAttribs1fvNV, 768)
+	GL_STUB(glVertexAttribs1svNV, 769)
+	GL_STUB(glVertexAttribs2dvNV, 770)
+	GL_STUB(glVertexAttribs2fvNV, 771)
+	GL_STUB(glVertexAttribs2svNV, 772)
+	GL_STUB(glVertexAttribs3dvNV, 773)
+	GL_STUB(glVertexAttribs3fvNV, 774)
+	GL_STUB(glVertexAttribs3svNV, 775)
+	GL_STUB(glVertexAttribs4dvNV, 776)
+	GL_STUB(glVertexAttribs4fvNV, 777)
+	GL_STUB(glVertexAttribs4svNV, 778)
+	GL_STUB(glVertexAttribs4ubvNV, 779)
+	GL_STUB(glGetTexBumpParameterfvATI, 780)
+	GL_STUB(glGetTexBumpParameterivATI, 781)
+	GL_STUB(glTexBumpParameterfvATI, 782)
+	GL_STUB(glTexBumpParameterivATI, 783)
+	GL_STUB(glAlphaFragmentOp1ATI, 784)
+	GL_STUB(glAlphaFragmentOp2ATI, 785)
+	GL_STUB(glAlphaFragmentOp3ATI, 786)
+	GL_STUB(glBeginFragmentShaderATI, 787)
+	GL_STUB(glBindFragmentShaderATI, 788)
+	GL_STUB(glColorFragmentOp1ATI, 789)
+	GL_STUB(glColorFragmentOp2ATI, 790)
+	GL_STUB(glColorFragmentOp3ATI, 791)
+	GL_STUB(glDeleteFragmentShaderATI, 792)
+	GL_STUB(glEndFragmentShaderATI, 793)
+	GL_STUB(glGenFragmentShadersATI, 794)
+	GL_STUB(glPassTexCoordATI, 795)
+	GL_STUB(glSampleMapATI, 796)
+	GL_STUB(glSetFragmentShaderConstantATI, 797)
+	GL_STUB(glPointParameteriNV, 798)
+	GL_STUB(glPointParameterivNV, 799)
 	GL_STUB(gl_dispatch_stub_800, 800)
 	HIDDEN(gl_dispatch_stub_800)
-	GL_STUB(glBindFramebufferEXT, 801)
-	GL_STUB(glBindRenderbufferEXT, 802)
-	GL_STUB(glCheckFramebufferStatusEXT, 803)
-	GL_STUB(glDeleteFramebuffersEXT, 804)
-	GL_STUB(glDeleteRenderbuffersEXT, 805)
-	GL_STUB(glFramebufferRenderbufferEXT, 806)
-	GL_STUB(glFramebufferTexture1DEXT, 807)
-	GL_STUB(glFramebufferTexture2DEXT, 808)
-	GL_STUB(glFramebufferTexture3DEXT, 809)
-	GL_STUB(glGenFramebuffersEXT, 810)
-	GL_STUB(glGenRenderbuffersEXT, 811)
-	GL_STUB(glGenerateMipmapEXT, 812)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 813)
-	GL_STUB(glGetRenderbufferParameterivEXT, 814)
-	GL_STUB(glIsFramebufferEXT, 815)
-	GL_STUB(glIsRenderbufferEXT, 816)
-	GL_STUB(glRenderbufferStorageEXT, 817)
-	GL_STUB(gl_dispatch_stub_818, 818)
-	HIDDEN(gl_dispatch_stub_818)
-	GL_STUB(gl_dispatch_stub_819, 819)
-	HIDDEN(gl_dispatch_stub_819)
-	GL_STUB(gl_dispatch_stub_820, 820)
-	HIDDEN(gl_dispatch_stub_820)
-	GL_STUB(glBindFragDataLocationEXT, 821)
-	GL_STUB(glGetFragDataLocationEXT, 822)
-	GL_STUB(glGetUniformuivEXT, 823)
-	GL_STUB(glGetVertexAttribIivEXT, 824)
-	GL_STUB(glGetVertexAttribIuivEXT, 825)
-	GL_STUB(glUniform1uiEXT, 826)
-	GL_STUB(glUniform1uivEXT, 827)
-	GL_STUB(glUniform2uiEXT, 828)
-	GL_STUB(glUniform2uivEXT, 829)
-	GL_STUB(glUniform3uiEXT, 830)
-	GL_STUB(glUniform3uivEXT, 831)
-	GL_STUB(glUniform4uiEXT, 832)
-	GL_STUB(glUniform4uivEXT, 833)
-	GL_STUB(glVertexAttribI1iEXT, 834)
-	GL_STUB(glVertexAttribI1ivEXT, 835)
-	GL_STUB(glVertexAttribI1uiEXT, 836)
-	GL_STUB(glVertexAttribI1uivEXT, 837)
-	GL_STUB(glVertexAttribI2iEXT, 838)
-	GL_STUB(glVertexAttribI2ivEXT, 839)
-	GL_STUB(glVertexAttribI2uiEXT, 840)
-	GL_STUB(glVertexAttribI2uivEXT, 841)
-	GL_STUB(glVertexAttribI3iEXT, 842)
-	GL_STUB(glVertexAttribI3ivEXT, 843)
-	GL_STUB(glVertexAttribI3uiEXT, 844)
-	GL_STUB(glVertexAttribI3uivEXT, 845)
-	GL_STUB(glVertexAttribI4bvEXT, 846)
-	GL_STUB(glVertexAttribI4iEXT, 847)
-	GL_STUB(glVertexAttribI4ivEXT, 848)
-	GL_STUB(glVertexAttribI4svEXT, 849)
-	GL_STUB(glVertexAttribI4ubvEXT, 850)
-	GL_STUB(glVertexAttribI4uiEXT, 851)
-	GL_STUB(glVertexAttribI4uivEXT, 852)
-	GL_STUB(glVertexAttribI4usvEXT, 853)
-	GL_STUB(glVertexAttribIPointerEXT, 854)
-	GL_STUB(glFramebufferTextureLayerEXT, 855)
-	GL_STUB(glColorMaskIndexedEXT, 856)
-	GL_STUB(glDisableIndexedEXT, 857)
-	GL_STUB(glEnableIndexedEXT, 858)
-	GL_STUB(glGetBooleanIndexedvEXT, 859)
-	GL_STUB(glGetIntegerIndexedvEXT, 860)
-	GL_STUB(glIsEnabledIndexedEXT, 861)
-	GL_STUB(glClearColorIiEXT, 862)
-	GL_STUB(glClearColorIuiEXT, 863)
-	GL_STUB(glGetTexParameterIivEXT, 864)
-	GL_STUB(glGetTexParameterIuivEXT, 865)
-	GL_STUB(glTexParameterIivEXT, 866)
-	GL_STUB(glTexParameterIuivEXT, 867)
-	GL_STUB(glBeginConditionalRenderNV, 868)
-	GL_STUB(glEndConditionalRenderNV, 869)
-	GL_STUB(glBeginTransformFeedbackEXT, 870)
-	GL_STUB(glBindBufferBaseEXT, 871)
-	GL_STUB(glBindBufferOffsetEXT, 872)
-	GL_STUB(glBindBufferRangeEXT, 873)
-	GL_STUB(glEndTransformFeedbackEXT, 874)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 875)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 876)
-	GL_STUB(glProvokingVertexEXT, 877)
-	GL_STUB(gl_dispatch_stub_878, 878)
-	HIDDEN(gl_dispatch_stub_878)
-	GL_STUB(gl_dispatch_stub_879, 879)
-	HIDDEN(gl_dispatch_stub_879)
-	GL_STUB(glGetObjectParameterivAPPLE, 880)
-	GL_STUB(glObjectPurgeableAPPLE, 881)
-	GL_STUB(glObjectUnpurgeableAPPLE, 882)
-	GL_STUB(glActiveProgramEXT, 883)
-	GL_STUB(glCreateShaderProgramEXT, 884)
-	GL_STUB(glUseShaderProgramEXT, 885)
-	GL_STUB(glTextureBarrierNV, 886)
-	GL_STUB(gl_dispatch_stub_887, 887)
-	HIDDEN(gl_dispatch_stub_887)
-	GL_STUB(gl_dispatch_stub_888, 888)
-	HIDDEN(gl_dispatch_stub_888)
-	GL_STUB(gl_dispatch_stub_889, 889)
-	HIDDEN(gl_dispatch_stub_889)
-	GL_STUB(gl_dispatch_stub_890, 890)
-	HIDDEN(gl_dispatch_stub_890)
-	GL_STUB(gl_dispatch_stub_891, 891)
-	HIDDEN(gl_dispatch_stub_891)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 892)
-	GL_STUB(glEGLImageTargetTexture2DOES, 893)
+	GL_STUB(gl_dispatch_stub_801, 801)
+	HIDDEN(gl_dispatch_stub_801)
+	GL_STUB(gl_dispatch_stub_802, 802)
+	HIDDEN(gl_dispatch_stub_802)
+	GL_STUB(gl_dispatch_stub_803, 803)
+	HIDDEN(gl_dispatch_stub_803)
+	GL_STUB(gl_dispatch_stub_804, 804)
+	HIDDEN(gl_dispatch_stub_804)
+	GL_STUB(glGetProgramNamedParameterdvNV, 805)
+	GL_STUB(glGetProgramNamedParameterfvNV, 806)
+	GL_STUB(glProgramNamedParameter4dNV, 807)
+	GL_STUB(glProgramNamedParameter4dvNV, 808)
+	GL_STUB(glProgramNamedParameter4fNV, 809)
+	GL_STUB(glProgramNamedParameter4fvNV, 810)
+	GL_STUB(glPrimitiveRestartIndexNV, 811)
+	GL_STUB(glPrimitiveRestartNV, 812)
+	GL_STUB(gl_dispatch_stub_813, 813)
+	HIDDEN(gl_dispatch_stub_813)
+	GL_STUB(gl_dispatch_stub_814, 814)
+	HIDDEN(gl_dispatch_stub_814)
+	GL_STUB(glBindFramebufferEXT, 815)
+	GL_STUB(glBindRenderbufferEXT, 816)
+	GL_STUB(glCheckFramebufferStatusEXT, 817)
+	GL_STUB(glDeleteFramebuffersEXT, 818)
+	GL_STUB(glDeleteRenderbuffersEXT, 819)
+	GL_STUB(glFramebufferRenderbufferEXT, 820)
+	GL_STUB(glFramebufferTexture1DEXT, 821)
+	GL_STUB(glFramebufferTexture2DEXT, 822)
+	GL_STUB(glFramebufferTexture3DEXT, 823)
+	GL_STUB(glGenFramebuffersEXT, 824)
+	GL_STUB(glGenRenderbuffersEXT, 825)
+	GL_STUB(glGenerateMipmapEXT, 826)
+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 827)
+	GL_STUB(glGetRenderbufferParameterivEXT, 828)
+	GL_STUB(glIsFramebufferEXT, 829)
+	GL_STUB(glIsRenderbufferEXT, 830)
+	GL_STUB(glRenderbufferStorageEXT, 831)
+	GL_STUB(gl_dispatch_stub_832, 832)
+	HIDDEN(gl_dispatch_stub_832)
+	GL_STUB(gl_dispatch_stub_833, 833)
+	HIDDEN(gl_dispatch_stub_833)
+	GL_STUB(gl_dispatch_stub_834, 834)
+	HIDDEN(gl_dispatch_stub_834)
+	GL_STUB(glBindFragDataLocationEXT, 835)
+	GL_STUB(glGetFragDataLocationEXT, 836)
+	GL_STUB(glGetUniformuivEXT, 837)
+	GL_STUB(glGetVertexAttribIivEXT, 838)
+	GL_STUB(glGetVertexAttribIuivEXT, 839)
+	GL_STUB(glUniform1uiEXT, 840)
+	GL_STUB(glUniform1uivEXT, 841)
+	GL_STUB(glUniform2uiEXT, 842)
+	GL_STUB(glUniform2uivEXT, 843)
+	GL_STUB(glUniform3uiEXT, 844)
+	GL_STUB(glUniform3uivEXT, 845)
+	GL_STUB(glUniform4uiEXT, 846)
+	GL_STUB(glUniform4uivEXT, 847)
+	GL_STUB(glVertexAttribI1iEXT, 848)
+	GL_STUB(glVertexAttribI1ivEXT, 849)
+	GL_STUB(glVertexAttribI1uiEXT, 850)
+	GL_STUB(glVertexAttribI1uivEXT, 851)
+	GL_STUB(glVertexAttribI2iEXT, 852)
+	GL_STUB(glVertexAttribI2ivEXT, 853)
+	GL_STUB(glVertexAttribI2uiEXT, 854)
+	GL_STUB(glVertexAttribI2uivEXT, 855)
+	GL_STUB(glVertexAttribI3iEXT, 856)
+	GL_STUB(glVertexAttribI3ivEXT, 857)
+	GL_STUB(glVertexAttribI3uiEXT, 858)
+	GL_STUB(glVertexAttribI3uivEXT, 859)
+	GL_STUB(glVertexAttribI4bvEXT, 860)
+	GL_STUB(glVertexAttribI4iEXT, 861)
+	GL_STUB(glVertexAttribI4ivEXT, 862)
+	GL_STUB(glVertexAttribI4svEXT, 863)
+	GL_STUB(glVertexAttribI4ubvEXT, 864)
+	GL_STUB(glVertexAttribI4uiEXT, 865)
+	GL_STUB(glVertexAttribI4uivEXT, 866)
+	GL_STUB(glVertexAttribI4usvEXT, 867)
+	GL_STUB(glVertexAttribIPointerEXT, 868)
+	GL_STUB(glFramebufferTextureLayerEXT, 869)
+	GL_STUB(glColorMaskIndexedEXT, 870)
+	GL_STUB(glDisableIndexedEXT, 871)
+	GL_STUB(glEnableIndexedEXT, 872)
+	GL_STUB(glGetBooleanIndexedvEXT, 873)
+	GL_STUB(glGetIntegerIndexedvEXT, 874)
+	GL_STUB(glIsEnabledIndexedEXT, 875)
+	GL_STUB(glClearColorIiEXT, 876)
+	GL_STUB(glClearColorIuiEXT, 877)
+	GL_STUB(glGetTexParameterIivEXT, 878)
+	GL_STUB(glGetTexParameterIuivEXT, 879)
+	GL_STUB(glTexParameterIivEXT, 880)
+	GL_STUB(glTexParameterIuivEXT, 881)
+	GL_STUB(glBeginConditionalRenderNV, 882)
+	GL_STUB(glEndConditionalRenderNV, 883)
+	GL_STUB(glBeginTransformFeedbackEXT, 884)
+	GL_STUB(glBindBufferBaseEXT, 885)
+	GL_STUB(glBindBufferOffsetEXT, 886)
+	GL_STUB(glBindBufferRangeEXT, 887)
+	GL_STUB(glEndTransformFeedbackEXT, 888)
+	GL_STUB(glGetTransformFeedbackVaryingEXT, 889)
+	GL_STUB(glTransformFeedbackVaryingsEXT, 890)
+	GL_STUB(glProvokingVertexEXT, 891)
+	GL_STUB(gl_dispatch_stub_892, 892)
+	HIDDEN(gl_dispatch_stub_892)
+	GL_STUB(gl_dispatch_stub_893, 893)
+	HIDDEN(gl_dispatch_stub_893)
+	GL_STUB(glGetObjectParameterivAPPLE, 894)
+	GL_STUB(glObjectPurgeableAPPLE, 895)
+	GL_STUB(glObjectUnpurgeableAPPLE, 896)
+	GL_STUB(glActiveProgramEXT, 897)
+	GL_STUB(glCreateShaderProgramEXT, 898)
+	GL_STUB(glUseShaderProgramEXT, 899)
+	GL_STUB(glTextureBarrierNV, 900)
+	GL_STUB(gl_dispatch_stub_901, 901)
+	HIDDEN(gl_dispatch_stub_901)
+	GL_STUB(gl_dispatch_stub_902, 902)
+	HIDDEN(gl_dispatch_stub_902)
+	GL_STUB(gl_dispatch_stub_903, 903)
+	HIDDEN(gl_dispatch_stub_903)
+	GL_STUB(gl_dispatch_stub_904, 904)
+	HIDDEN(gl_dispatch_stub_904)
+	GL_STUB(gl_dispatch_stub_905, 905)
+	HIDDEN(gl_dispatch_stub_905)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 906)
+	GL_STUB(glEGLImageTargetTexture2DOES, 907)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mapi/glapi/glapi_x86-64.S b/src/mapi/glapi/glapi_x86-64.S
index b588e64be85..9b81f52d763 100644
--- a/src/mapi/glapi/glapi_x86-64.S
+++ b/src/mapi/glapi/glapi_x86-64.S
@@ -22660,9 +22660,9 @@ GL_PREFIX(BlendFunciARB):
 	.size	GL_PREFIX(BlendFunciARB), .-GL_PREFIX(BlendFunciARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(BindTransformFeedback)
-	.type	GL_PREFIX(BindTransformFeedback), @function
-GL_PREFIX(BindTransformFeedback):
+	.globl	GL_PREFIX(BindSampler)
+	.type	GL_PREFIX(BindSampler), @function
+GL_PREFIX(BindSampler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4800(%rax), %r11
@@ -22694,12 +22694,12 @@ GL_PREFIX(BindTransformFeedback):
 	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(BindTransformFeedback), .-GL_PREFIX(BindTransformFeedback)
+	.size	GL_PREFIX(BindSampler), .-GL_PREFIX(BindSampler)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(DeleteTransformFeedbacks)
-	.type	GL_PREFIX(DeleteTransformFeedbacks), @function
-GL_PREFIX(DeleteTransformFeedbacks):
+	.globl	GL_PREFIX(DeleteSamplers)
+	.type	GL_PREFIX(DeleteSamplers), @function
+GL_PREFIX(DeleteSamplers):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4808(%rax), %r11
@@ -22731,12 +22731,12 @@ GL_PREFIX(DeleteTransformFeedbacks):
 	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(DeleteTransformFeedbacks), .-GL_PREFIX(DeleteTransformFeedbacks)
+	.size	GL_PREFIX(DeleteSamplers), .-GL_PREFIX(DeleteSamplers)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(DrawTransformFeedback)
-	.type	GL_PREFIX(DrawTransformFeedback), @function
-GL_PREFIX(DrawTransformFeedback):
+	.globl	GL_PREFIX(GenSamplers)
+	.type	GL_PREFIX(GenSamplers), @function
+GL_PREFIX(GenSamplers):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4816(%rax), %r11
@@ -22768,6 +22768,520 @@ GL_PREFIX(DrawTransformFeedback):
 	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GenSamplers), .-GL_PREFIX(GenSamplers)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSamplerParameterIiv)
+	.type	GL_PREFIX(GetSamplerParameterIiv), @function
+GL_PREFIX(GetSamplerParameterIiv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4824(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4824(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4824(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4824(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSamplerParameterIiv), .-GL_PREFIX(GetSamplerParameterIiv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSamplerParameterIuiv)
+	.type	GL_PREFIX(GetSamplerParameterIuiv), @function
+GL_PREFIX(GetSamplerParameterIuiv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4832(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSamplerParameterIuiv), .-GL_PREFIX(GetSamplerParameterIuiv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSamplerParameterfv)
+	.type	GL_PREFIX(GetSamplerParameterfv), @function
+GL_PREFIX(GetSamplerParameterfv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4840(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSamplerParameterfv), .-GL_PREFIX(GetSamplerParameterfv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSamplerParameteriv)
+	.type	GL_PREFIX(GetSamplerParameteriv), @function
+GL_PREFIX(GetSamplerParameteriv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4848(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4848(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4848(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4848(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSamplerParameteriv), .-GL_PREFIX(GetSamplerParameteriv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(IsSampler)
+	.type	GL_PREFIX(IsSampler), @function
+GL_PREFIX(IsSampler):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4856(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4856(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4856(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4856(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(IsSampler), .-GL_PREFIX(IsSampler)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameterIiv)
+	.type	GL_PREFIX(SamplerParameterIiv), @function
+GL_PREFIX(SamplerParameterIiv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4864(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4864(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4864(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4864(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameterIiv), .-GL_PREFIX(SamplerParameterIiv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameterIuiv)
+	.type	GL_PREFIX(SamplerParameterIuiv), @function
+GL_PREFIX(SamplerParameterIuiv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4872(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4872(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4872(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4872(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameterIuiv), .-GL_PREFIX(SamplerParameterIuiv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameterf)
+	.type	GL_PREFIX(SamplerParameterf), @function
+GL_PREFIX(SamplerParameterf):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4880(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%rsi, 8(%rsp)
+	movq	%xmm0, 16(%rsp)
+	call	_x86_64_get_dispatch@PLT
+	movq	16(%rsp), %xmm0
+	movq	8(%rsp), %rsi
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
+	movq	4880(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4880(%rax), %r11
+	jmp	*%r11
+1:
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%rsi, 8(%rsp)
+	movq	%xmm0, 16(%rsp)
+	call	_glapi_get_dispatch
+	movq	16(%rsp), %xmm0
+	movq	8(%rsp), %rsi
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
+	movq	4880(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameterf), .-GL_PREFIX(SamplerParameterf)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameterfv)
+	.type	GL_PREFIX(SamplerParameterfv), @function
+GL_PREFIX(SamplerParameterfv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4888(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4888(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4888(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4888(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameterfv), .-GL_PREFIX(SamplerParameterfv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameteri)
+	.type	GL_PREFIX(SamplerParameteri), @function
+GL_PREFIX(SamplerParameteri):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4896(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4896(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4896(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4896(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameteri), .-GL_PREFIX(SamplerParameteri)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(SamplerParameteriv)
+	.type	GL_PREFIX(SamplerParameteriv), @function
+GL_PREFIX(SamplerParameteriv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4904(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4904(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4904(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4904(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(SamplerParameteriv), .-GL_PREFIX(SamplerParameteriv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(BindTransformFeedback)
+	.type	GL_PREFIX(BindTransformFeedback), @function
+GL_PREFIX(BindTransformFeedback):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4912(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4912(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4912(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4912(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(BindTransformFeedback), .-GL_PREFIX(BindTransformFeedback)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(DeleteTransformFeedbacks)
+	.type	GL_PREFIX(DeleteTransformFeedbacks), @function
+GL_PREFIX(DeleteTransformFeedbacks):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4920(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4920(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4920(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4920(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(DeleteTransformFeedbacks), .-GL_PREFIX(DeleteTransformFeedbacks)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(DrawTransformFeedback)
+	.type	GL_PREFIX(DrawTransformFeedback), @function
+GL_PREFIX(DrawTransformFeedback):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4928(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4928(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4928(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4928(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawTransformFeedback), .-GL_PREFIX(DrawTransformFeedback)
 
 	.p2align	4,,15
@@ -22776,7 +23290,7 @@ GL_PREFIX(DrawTransformFeedback):
 GL_PREFIX(GenTransformFeedbacks):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22786,13 +23300,13 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22802,7 +23316,7 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenTransformFeedbacks), .-GL_PREFIX(GenTransformFeedbacks)
@@ -22813,25 +23327,25 @@ GL_PREFIX(GenTransformFeedbacks):
 GL_PREFIX(IsTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsTransformFeedback), .-GL_PREFIX(IsTransformFeedback)
@@ -22842,25 +23356,25 @@ GL_PREFIX(IsTransformFeedback):
 GL_PREFIX(PauseTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4840(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4840(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PauseTransformFeedback), .-GL_PREFIX(PauseTransformFeedback)
@@ -22871,25 +23385,25 @@ GL_PREFIX(PauseTransformFeedback):
 GL_PREFIX(ResumeTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4848(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4848(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResumeTransformFeedback), .-GL_PREFIX(ResumeTransformFeedback)
@@ -22900,25 +23414,25 @@ GL_PREFIX(ResumeTransformFeedback):
 GL_PREFIX(ClearDepthf):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearDepthf), .-GL_PREFIX(ClearDepthf)
@@ -22929,7 +23443,7 @@ GL_PREFIX(ClearDepthf):
 GL_PREFIX(DepthRangef):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22939,13 +23453,13 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22955,7 +23469,7 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DepthRangef), .-GL_PREFIX(DepthRangef)
@@ -22966,7 +23480,7 @@ GL_PREFIX(DepthRangef):
 GL_PREFIX(GetShaderPrecisionFormat):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22980,13 +23494,13 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23000,7 +23514,7 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetShaderPrecisionFormat), .-GL_PREFIX(GetShaderPrecisionFormat)
@@ -23011,25 +23525,25 @@ GL_PREFIX(GetShaderPrecisionFormat):
 GL_PREFIX(ReleaseShaderCompiler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4880(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4880(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReleaseShaderCompiler), .-GL_PREFIX(ReleaseShaderCompiler)
@@ -23040,7 +23554,7 @@ GL_PREFIX(ReleaseShaderCompiler):
 GL_PREFIX(ShaderBinary):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23054,13 +23568,13 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23074,7 +23588,7 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ShaderBinary), .-GL_PREFIX(ShaderBinary)
@@ -23085,7 +23599,7 @@ GL_PREFIX(ShaderBinary):
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23095,13 +23609,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4896(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23111,19 +23625,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4896(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_613)
-	.type	GL_PREFIX(_dispatch_stub_613), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_613))
-GL_PREFIX(_dispatch_stub_613):
+	.globl	GL_PREFIX(_dispatch_stub_627)
+	.type	GL_PREFIX(_dispatch_stub_627), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_627))
+GL_PREFIX(_dispatch_stub_627):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23133,13 +23647,13 @@ GL_PREFIX(_dispatch_stub_613):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23149,19 +23663,19 @@ GL_PREFIX(_dispatch_stub_613):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_613), .-GL_PREFIX(_dispatch_stub_613)
+	.size	GL_PREFIX(_dispatch_stub_627), .-GL_PREFIX(_dispatch_stub_627)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_614)
-	.type	GL_PREFIX(_dispatch_stub_614), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_614))
-GL_PREFIX(_dispatch_stub_614):
+	.globl	GL_PREFIX(_dispatch_stub_628)
+	.type	GL_PREFIX(_dispatch_stub_628), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_628))
+GL_PREFIX(_dispatch_stub_628):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23171,13 +23685,13 @@ GL_PREFIX(_dispatch_stub_614):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23187,19 +23701,19 @@ GL_PREFIX(_dispatch_stub_614):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_614), .-GL_PREFIX(_dispatch_stub_614)
+	.size	GL_PREFIX(_dispatch_stub_628), .-GL_PREFIX(_dispatch_stub_628)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_615)
-	.type	GL_PREFIX(_dispatch_stub_615), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_615))
-GL_PREFIX(_dispatch_stub_615):
+	.globl	GL_PREFIX(_dispatch_stub_629)
+	.type	GL_PREFIX(_dispatch_stub_629), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_629))
+GL_PREFIX(_dispatch_stub_629):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23209,13 +23723,13 @@ GL_PREFIX(_dispatch_stub_615):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4920(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23225,19 +23739,19 @@ GL_PREFIX(_dispatch_stub_615):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4920(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_615), .-GL_PREFIX(_dispatch_stub_615)
+	.size	GL_PREFIX(_dispatch_stub_629), .-GL_PREFIX(_dispatch_stub_629)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_616)
-	.type	GL_PREFIX(_dispatch_stub_616), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_616))
-GL_PREFIX(_dispatch_stub_616):
+	.globl	GL_PREFIX(_dispatch_stub_630)
+	.type	GL_PREFIX(_dispatch_stub_630), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_630))
+GL_PREFIX(_dispatch_stub_630):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23247,13 +23761,13 @@ GL_PREFIX(_dispatch_stub_616):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23263,19 +23777,19 @@ GL_PREFIX(_dispatch_stub_616):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_616), .-GL_PREFIX(_dispatch_stub_616)
+	.size	GL_PREFIX(_dispatch_stub_630), .-GL_PREFIX(_dispatch_stub_630)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_617)
-	.type	GL_PREFIX(_dispatch_stub_617), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_617))
-GL_PREFIX(_dispatch_stub_617):
+	.globl	GL_PREFIX(_dispatch_stub_631)
+	.type	GL_PREFIX(_dispatch_stub_631), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_631))
+GL_PREFIX(_dispatch_stub_631):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23285,13 +23799,13 @@ GL_PREFIX(_dispatch_stub_617):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23301,19 +23815,19 @@ GL_PREFIX(_dispatch_stub_617):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_617), .-GL_PREFIX(_dispatch_stub_617)
+	.size	GL_PREFIX(_dispatch_stub_631), .-GL_PREFIX(_dispatch_stub_631)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_618)
-	.type	GL_PREFIX(_dispatch_stub_618), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_618))
-GL_PREFIX(_dispatch_stub_618):
+	.globl	GL_PREFIX(_dispatch_stub_632)
+	.type	GL_PREFIX(_dispatch_stub_632), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_632))
+GL_PREFIX(_dispatch_stub_632):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23323,13 +23837,13 @@ GL_PREFIX(_dispatch_stub_618):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23339,19 +23853,19 @@ GL_PREFIX(_dispatch_stub_618):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_618), .-GL_PREFIX(_dispatch_stub_618)
+	.size	GL_PREFIX(_dispatch_stub_632), .-GL_PREFIX(_dispatch_stub_632)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_619)
-	.type	GL_PREFIX(_dispatch_stub_619), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_619))
-GL_PREFIX(_dispatch_stub_619):
+	.globl	GL_PREFIX(_dispatch_stub_633)
+	.type	GL_PREFIX(_dispatch_stub_633), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_633))
+GL_PREFIX(_dispatch_stub_633):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23361,13 +23875,13 @@ GL_PREFIX(_dispatch_stub_619):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23377,40 +23891,40 @@ GL_PREFIX(_dispatch_stub_619):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_619), .-GL_PREFIX(_dispatch_stub_619)
+	.size	GL_PREFIX(_dispatch_stub_633), .-GL_PREFIX(_dispatch_stub_633)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_620)
-	.type	GL_PREFIX(_dispatch_stub_620), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_620))
-GL_PREFIX(_dispatch_stub_620):
+	.globl	GL_PREFIX(_dispatch_stub_634)
+	.type	GL_PREFIX(_dispatch_stub_634), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_634))
+GL_PREFIX(_dispatch_stub_634):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_620), .-GL_PREFIX(_dispatch_stub_620)
+	.size	GL_PREFIX(_dispatch_stub_634), .-GL_PREFIX(_dispatch_stub_634)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -23418,7 +23932,7 @@ GL_PREFIX(_dispatch_stub_620):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23432,13 +23946,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23452,7 +23966,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -23463,7 +23977,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23473,13 +23987,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23489,7 +24003,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -23500,7 +24014,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23514,13 +24028,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23534,7 +24048,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -23545,7 +24059,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23559,13 +24073,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23579,7 +24093,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -23590,7 +24104,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23604,13 +24118,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23624,7 +24138,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -23635,7 +24149,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23649,13 +24163,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23669,7 +24183,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -23680,7 +24194,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23690,13 +24204,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5016(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23706,7 +24220,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5016(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -23717,7 +24231,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23727,13 +24241,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23743,7 +24257,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -23754,7 +24268,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23764,13 +24278,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23780,7 +24294,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -23791,25 +24305,25 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5040(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5040(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
@@ -23820,7 +24334,7 @@ GL_PREFIX(UnlockArraysEXT):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23830,13 +24344,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23846,7 +24360,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -23857,25 +24371,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -23886,7 +24400,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23898,13 +24412,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5064(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23916,7 +24430,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5064(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -23927,25 +24441,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -23956,7 +24470,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23968,13 +24482,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5080(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23986,7 +24500,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5080(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -23997,25 +24511,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -24026,7 +24540,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24036,13 +24550,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24052,7 +24566,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -24063,25 +24577,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -24092,7 +24606,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24102,13 +24616,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24118,7 +24632,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -24129,25 +24643,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -24158,7 +24672,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24168,13 +24682,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24184,7 +24698,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -24195,25 +24709,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -24224,7 +24738,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24234,13 +24748,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24250,7 +24764,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -24261,25 +24775,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -24290,7 +24804,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24300,13 +24814,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24316,7 +24830,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -24327,25 +24841,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -24356,7 +24870,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24370,13 +24884,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24390,7 +24904,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -24401,7 +24915,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24415,13 +24929,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24435,7 +24949,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -24446,7 +24960,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24460,13 +24974,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24480,7 +24994,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -24491,7 +25005,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24501,13 +25015,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24517,7 +25031,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -24528,7 +25042,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -24536,13 +25050,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5208(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -24550,7 +25064,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5208(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -24561,25 +25075,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -24590,7 +25104,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -24598,13 +25112,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5224(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -24612,7 +25126,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5224(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -24623,58 +25137,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_655)
-	.type	GL_PREFIX(_dispatch_stub_655), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_655))
-GL_PREFIX(_dispatch_stub_655):
+	.globl	GL_PREFIX(_dispatch_stub_669)
+	.type	GL_PREFIX(_dispatch_stub_669), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_669))
+GL_PREFIX(_dispatch_stub_669):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
+	.size	GL_PREFIX(_dispatch_stub_669), .-GL_PREFIX(_dispatch_stub_669)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -24682,7 +25196,7 @@ GL_PREFIX(_dispatch_stub_655):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24696,13 +25210,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24716,7 +25230,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -24727,25 +25241,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5256(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5256(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -24756,7 +25270,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24766,13 +25280,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24782,7 +25296,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -24793,7 +25307,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24811,13 +25325,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24835,7 +25349,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -24846,7 +25360,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24864,13 +25378,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24888,7 +25402,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -24899,7 +25413,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -24909,13 +25423,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5288(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24925,7 +25439,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5288(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -24936,7 +25450,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24946,13 +25460,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24962,7 +25476,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -24973,7 +25487,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24983,13 +25497,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24999,7 +25513,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -25010,7 +25524,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25020,13 +25534,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25036,7 +25550,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -25047,7 +25561,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25061,13 +25575,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25081,7 +25595,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -25092,7 +25606,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25106,13 +25620,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25126,7 +25640,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -25137,7 +25651,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25151,13 +25665,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25171,7 +25685,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -25182,7 +25696,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25196,13 +25710,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25216,7 +25730,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -25227,7 +25741,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25241,13 +25755,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25261,7 +25775,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -25272,7 +25786,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25282,13 +25796,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25298,7 +25812,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -25309,7 +25823,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25319,13 +25833,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25335,7 +25849,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -25346,25 +25860,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5376(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5376(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -25375,7 +25889,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25385,13 +25899,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5384(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25401,7 +25915,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5384(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -25412,25 +25926,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -25441,7 +25955,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25451,13 +25965,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5400(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25467,7 +25981,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5400(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -25478,25 +25992,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -25507,7 +26021,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25517,13 +26031,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25533,7 +26047,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -25544,25 +26058,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -25573,7 +26087,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25583,13 +26097,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25599,7 +26113,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -25610,25 +26124,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -25639,7 +26153,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25651,13 +26165,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25669,7 +26183,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5448(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -25680,25 +26194,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -25709,7 +26223,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25721,13 +26235,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25739,7 +26253,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -25750,25 +26264,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -25779,7 +26293,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25789,13 +26303,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25805,7 +26319,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -25816,25 +26330,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -25845,7 +26359,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25855,13 +26369,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25871,7 +26385,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -25882,25 +26396,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -25911,7 +26425,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -25925,13 +26439,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5512(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -25945,7 +26459,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5512(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -25956,25 +26470,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -25985,7 +26499,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -25999,13 +26513,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26019,7 +26533,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5528(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -26030,25 +26544,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -26059,7 +26573,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26073,13 +26587,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26093,7 +26607,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -26104,25 +26618,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -26133,7 +26647,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26147,13 +26661,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26167,7 +26681,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -26178,37 +26692,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_697)
-	.type	GL_PREFIX(_dispatch_stub_697), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_697))
-GL_PREFIX(_dispatch_stub_697):
+	.globl	GL_PREFIX(_dispatch_stub_711)
+	.type	GL_PREFIX(_dispatch_stub_711), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_711))
+GL_PREFIX(_dispatch_stub_711):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26222,13 +26736,13 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26242,19 +26756,19 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_697), .-GL_PREFIX(_dispatch_stub_697)
+	.size	GL_PREFIX(_dispatch_stub_711), .-GL_PREFIX(_dispatch_stub_711)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_698)
-	.type	GL_PREFIX(_dispatch_stub_698), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_698))
-GL_PREFIX(_dispatch_stub_698):
+	.globl	GL_PREFIX(_dispatch_stub_712)
+	.type	GL_PREFIX(_dispatch_stub_712), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_712))
+GL_PREFIX(_dispatch_stub_712):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26272,13 +26786,13 @@ GL_PREFIX(_dispatch_stub_698):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26296,19 +26810,19 @@ GL_PREFIX(_dispatch_stub_698):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_698), .-GL_PREFIX(_dispatch_stub_698)
+	.size	GL_PREFIX(_dispatch_stub_712), .-GL_PREFIX(_dispatch_stub_712)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_699)
-	.type	GL_PREFIX(_dispatch_stub_699), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_699))
-GL_PREFIX(_dispatch_stub_699):
+	.globl	GL_PREFIX(_dispatch_stub_713)
+	.type	GL_PREFIX(_dispatch_stub_713), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_713))
+GL_PREFIX(_dispatch_stub_713):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26318,13 +26832,13 @@ GL_PREFIX(_dispatch_stub_699):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26334,49 +26848,49 @@ GL_PREFIX(_dispatch_stub_699):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_699), .-GL_PREFIX(_dispatch_stub_699)
+	.size	GL_PREFIX(_dispatch_stub_713), .-GL_PREFIX(_dispatch_stub_713)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_700)
-	.type	GL_PREFIX(_dispatch_stub_700), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_700))
-GL_PREFIX(_dispatch_stub_700):
+	.globl	GL_PREFIX(_dispatch_stub_714)
+	.type	GL_PREFIX(_dispatch_stub_714), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_714))
+GL_PREFIX(_dispatch_stub_714):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_700), .-GL_PREFIX(_dispatch_stub_700)
+	.size	GL_PREFIX(_dispatch_stub_714), .-GL_PREFIX(_dispatch_stub_714)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_701)
-	.type	GL_PREFIX(_dispatch_stub_701), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_701))
-GL_PREFIX(_dispatch_stub_701):
+	.globl	GL_PREFIX(_dispatch_stub_715)
+	.type	GL_PREFIX(_dispatch_stub_715), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_715))
+GL_PREFIX(_dispatch_stub_715):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26386,13 +26900,13 @@ GL_PREFIX(_dispatch_stub_701):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26402,19 +26916,19 @@ GL_PREFIX(_dispatch_stub_701):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_701), .-GL_PREFIX(_dispatch_stub_701)
+	.size	GL_PREFIX(_dispatch_stub_715), .-GL_PREFIX(_dispatch_stub_715)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_702)
-	.type	GL_PREFIX(_dispatch_stub_702), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_702))
-GL_PREFIX(_dispatch_stub_702):
+	.globl	GL_PREFIX(_dispatch_stub_716)
+	.type	GL_PREFIX(_dispatch_stub_716), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_716))
+GL_PREFIX(_dispatch_stub_716):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26424,13 +26938,13 @@ GL_PREFIX(_dispatch_stub_702):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26440,49 +26954,49 @@ GL_PREFIX(_dispatch_stub_702):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_702), .-GL_PREFIX(_dispatch_stub_702)
+	.size	GL_PREFIX(_dispatch_stub_716), .-GL_PREFIX(_dispatch_stub_716)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_703)
-	.type	GL_PREFIX(_dispatch_stub_703), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_703))
-GL_PREFIX(_dispatch_stub_703):
+	.globl	GL_PREFIX(_dispatch_stub_717)
+	.type	GL_PREFIX(_dispatch_stub_717), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_717))
+GL_PREFIX(_dispatch_stub_717):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_703), .-GL_PREFIX(_dispatch_stub_703)
+	.size	GL_PREFIX(_dispatch_stub_717), .-GL_PREFIX(_dispatch_stub_717)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_704)
-	.type	GL_PREFIX(_dispatch_stub_704), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_704))
-GL_PREFIX(_dispatch_stub_704):
+	.globl	GL_PREFIX(_dispatch_stub_718)
+	.type	GL_PREFIX(_dispatch_stub_718), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_718))
+GL_PREFIX(_dispatch_stub_718):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26492,13 +27006,13 @@ GL_PREFIX(_dispatch_stub_704):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26508,40 +27022,40 @@ GL_PREFIX(_dispatch_stub_704):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_704), .-GL_PREFIX(_dispatch_stub_704)
+	.size	GL_PREFIX(_dispatch_stub_718), .-GL_PREFIX(_dispatch_stub_718)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_705)
-	.type	GL_PREFIX(_dispatch_stub_705), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_705))
-GL_PREFIX(_dispatch_stub_705):
+	.globl	GL_PREFIX(_dispatch_stub_719)
+	.type	GL_PREFIX(_dispatch_stub_719), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_719))
+GL_PREFIX(_dispatch_stub_719):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_705), .-GL_PREFIX(_dispatch_stub_705)
+	.size	GL_PREFIX(_dispatch_stub_719), .-GL_PREFIX(_dispatch_stub_719)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -26549,7 +27063,7 @@ GL_PREFIX(_dispatch_stub_705):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26559,13 +27073,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26575,7 +27089,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -26586,7 +27100,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26596,13 +27110,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26612,7 +27126,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -26623,7 +27137,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26633,13 +27147,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26649,7 +27163,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -26660,7 +27174,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26670,13 +27184,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26686,7 +27200,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -26697,7 +27211,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26707,13 +27221,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26723,7 +27237,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -26734,7 +27248,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26748,13 +27262,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26768,7 +27282,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -26779,7 +27293,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26793,13 +27307,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26813,7 +27327,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -26824,7 +27338,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26834,13 +27348,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26850,7 +27364,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -26861,7 +27375,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26871,13 +27385,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26887,7 +27401,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -26898,7 +27412,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26912,13 +27426,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26932,7 +27446,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -26943,7 +27457,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26953,13 +27467,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26969,7 +27483,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -26980,7 +27494,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26990,13 +27504,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27006,7 +27520,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -27017,7 +27531,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27027,13 +27541,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27043,7 +27557,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -27054,7 +27568,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27064,13 +27578,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27080,7 +27594,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -27091,25 +27605,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -27120,7 +27634,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27134,13 +27648,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27154,7 +27668,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -27165,7 +27679,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27179,13 +27693,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27199,7 +27713,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -27210,7 +27724,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27224,13 +27738,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27244,7 +27758,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -27255,7 +27769,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27265,13 +27779,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27281,7 +27795,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -27292,7 +27806,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27306,13 +27820,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27326,7 +27840,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -27337,7 +27851,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27347,13 +27861,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5808(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27363,7 +27877,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5808(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -27374,7 +27888,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27384,13 +27898,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27400,7 +27914,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -27411,7 +27925,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27421,13 +27935,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5824(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27437,7 +27951,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5824(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -27448,7 +27962,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27458,13 +27972,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27474,7 +27988,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -27485,7 +27999,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27495,13 +28009,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27511,7 +28025,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -27522,7 +28036,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27532,13 +28046,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27548,7 +28062,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -27559,7 +28073,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27571,13 +28085,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5856(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27589,7 +28103,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5856(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -27600,7 +28114,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27610,13 +28124,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27626,7 +28140,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -27637,7 +28151,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27649,13 +28163,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5872(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27667,7 +28181,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5872(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -27678,7 +28192,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27688,13 +28202,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27704,7 +28218,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -27715,7 +28229,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27725,13 +28239,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27741,7 +28255,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5888(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -27752,7 +28266,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27762,13 +28276,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27778,7 +28292,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -27789,7 +28303,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -27803,13 +28317,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5904(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -27823,7 +28337,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5904(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -27834,7 +28348,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27844,13 +28358,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27860,7 +28374,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -27871,7 +28385,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -27885,13 +28399,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5920(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -27905,7 +28419,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5920(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -27916,7 +28430,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27926,13 +28440,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27942,7 +28456,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -27953,7 +28467,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27967,13 +28481,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27987,7 +28501,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -27998,7 +28512,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28008,13 +28522,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28024,7 +28538,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -28035,7 +28549,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -28051,13 +28565,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5952(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -28073,7 +28587,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5952(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -28084,7 +28598,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28094,13 +28608,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28110,7 +28624,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -28121,7 +28635,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -28137,13 +28651,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5968(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -28159,7 +28673,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5968(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -28170,7 +28684,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28180,13 +28694,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28196,7 +28710,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -28207,7 +28721,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28221,13 +28735,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28241,7 +28755,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -28252,7 +28766,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28262,13 +28776,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28278,7 +28792,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -28289,7 +28803,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28303,13 +28817,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28323,7 +28837,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -28334,7 +28848,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28344,13 +28858,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28360,7 +28874,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -28371,7 +28885,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28385,13 +28899,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28405,7 +28919,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -28416,7 +28930,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28426,13 +28940,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28442,7 +28956,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -28453,7 +28967,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28463,13 +28977,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28479,7 +28993,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -28490,7 +29004,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28500,13 +29014,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28516,7 +29030,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -28527,7 +29041,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28537,13 +29051,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28553,7 +29067,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -28564,7 +29078,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28574,13 +29088,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28590,7 +29104,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -28601,7 +29115,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28611,13 +29125,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28627,7 +29141,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -28638,7 +29152,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28648,13 +29162,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28664,7 +29178,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -28675,7 +29189,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28685,13 +29199,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28701,7 +29215,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -28712,7 +29226,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28722,13 +29236,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28738,7 +29252,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -28749,7 +29263,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28759,13 +29273,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28775,7 +29289,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -28786,7 +29300,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28796,13 +29310,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28812,7 +29326,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -28823,7 +29337,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28833,13 +29347,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28849,7 +29363,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -28860,7 +29374,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28870,13 +29384,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28886,7 +29400,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -28897,7 +29411,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28907,13 +29421,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28923,7 +29437,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -28934,7 +29448,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28944,13 +29458,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28960,7 +29474,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -28971,7 +29485,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28981,13 +29495,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28997,7 +29511,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -29008,7 +29522,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29018,13 +29532,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29034,7 +29548,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -29045,7 +29559,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29063,13 +29577,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29087,7 +29601,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -29098,7 +29612,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29116,13 +29630,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29140,7 +29654,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -29151,7 +29665,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29169,13 +29683,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29193,7 +29707,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -29204,25 +29718,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6184(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6184(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -29233,25 +29747,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -29262,7 +29776,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29280,13 +29794,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29304,7 +29818,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -29315,7 +29829,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29333,13 +29847,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29357,7 +29871,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -29368,7 +29882,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29386,13 +29900,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29410,7 +29924,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -29421,25 +29935,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -29450,25 +29964,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6232(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6232(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -29479,25 +29993,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -29508,7 +30022,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29518,13 +30032,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29534,7 +30048,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -29545,7 +30059,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29555,13 +30069,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29571,7 +30085,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -29582,7 +30096,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29592,13 +30106,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29608,7 +30122,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -29619,7 +30133,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29629,13 +30143,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29645,7 +30159,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -29656,7 +30170,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6280(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29666,13 +30180,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6280(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29682,79 +30196,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_786)
-	.type	GL_PREFIX(_dispatch_stub_786), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_786))
-GL_PREFIX(_dispatch_stub_786):
+	.globl	GL_PREFIX(_dispatch_stub_800)
+	.type	GL_PREFIX(_dispatch_stub_800), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_800))
+GL_PREFIX(_dispatch_stub_800):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6288(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6288(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
+	.size	GL_PREFIX(_dispatch_stub_800), .-GL_PREFIX(_dispatch_stub_800)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_787)
-	.type	GL_PREFIX(_dispatch_stub_787), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_787))
-GL_PREFIX(_dispatch_stub_787):
+	.globl	GL_PREFIX(_dispatch_stub_801)
+	.type	GL_PREFIX(_dispatch_stub_801), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_801))
+GL_PREFIX(_dispatch_stub_801):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6296(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6296(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
+	.size	GL_PREFIX(_dispatch_stub_801), .-GL_PREFIX(_dispatch_stub_801)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_788)
-	.type	GL_PREFIX(_dispatch_stub_788), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_788))
-GL_PREFIX(_dispatch_stub_788):
+	.globl	GL_PREFIX(_dispatch_stub_802)
+	.type	GL_PREFIX(_dispatch_stub_802), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_802))
+GL_PREFIX(_dispatch_stub_802):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6304(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29764,13 +30278,13 @@ GL_PREFIX(_dispatch_stub_788):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6304(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29780,19 +30294,19 @@ GL_PREFIX(_dispatch_stub_788):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
+	.size	GL_PREFIX(_dispatch_stub_802), .-GL_PREFIX(_dispatch_stub_802)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_789)
-	.type	GL_PREFIX(_dispatch_stub_789), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_789))
-GL_PREFIX(_dispatch_stub_789):
+	.globl	GL_PREFIX(_dispatch_stub_803)
+	.type	GL_PREFIX(_dispatch_stub_803), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_803))
+GL_PREFIX(_dispatch_stub_803):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6312(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29802,13 +30316,13 @@ GL_PREFIX(_dispatch_stub_789):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6312(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29818,40 +30332,40 @@ GL_PREFIX(_dispatch_stub_789):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
+	.size	GL_PREFIX(_dispatch_stub_803), .-GL_PREFIX(_dispatch_stub_803)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_790)
-	.type	GL_PREFIX(_dispatch_stub_790), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_790))
-GL_PREFIX(_dispatch_stub_790):
+	.globl	GL_PREFIX(_dispatch_stub_804)
+	.type	GL_PREFIX(_dispatch_stub_804), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_804))
+GL_PREFIX(_dispatch_stub_804):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6320(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6320(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
+	.size	GL_PREFIX(_dispatch_stub_804), .-GL_PREFIX(_dispatch_stub_804)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -29859,7 +30373,7 @@ GL_PREFIX(_dispatch_stub_790):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29873,13 +30387,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29893,7 +30407,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -29904,7 +30418,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29918,13 +30432,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29938,7 +30452,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -29949,7 +30463,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6344(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -29969,13 +30483,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6344(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -29995,7 +30509,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6344(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -30006,7 +30520,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6352(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30020,13 +30534,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30040,7 +30554,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -30051,7 +30565,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6360(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -30071,13 +30585,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6360(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6360(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -30097,7 +30611,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6360(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -30108,7 +30622,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6368(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30122,13 +30636,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6368(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30142,7 +30656,7 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
@@ -30153,25 +30667,25 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 GL_PREFIX(PrimitiveRestartIndexNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6376(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6376(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartIndexNV), .-GL_PREFIX(PrimitiveRestartIndexNV)
@@ -30182,37 +30696,37 @@ GL_PREFIX(PrimitiveRestartIndexNV):
 GL_PREFIX(PrimitiveRestartNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6384(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6384(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6384(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6384(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartNV), .-GL_PREFIX(PrimitiveRestartNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_799)
-	.type	GL_PREFIX(_dispatch_stub_799), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_799))
-GL_PREFIX(_dispatch_stub_799):
+	.globl	GL_PREFIX(_dispatch_stub_813)
+	.type	GL_PREFIX(_dispatch_stub_813), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_813))
+GL_PREFIX(_dispatch_stub_813):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6392(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30222,13 +30736,13 @@ GL_PREFIX(_dispatch_stub_799):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6392(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30238,19 +30752,19 @@ GL_PREFIX(_dispatch_stub_799):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_799), .-GL_PREFIX(_dispatch_stub_799)
+	.size	GL_PREFIX(_dispatch_stub_813), .-GL_PREFIX(_dispatch_stub_813)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_800)
-	.type	GL_PREFIX(_dispatch_stub_800), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_800))
-GL_PREFIX(_dispatch_stub_800):
+	.globl	GL_PREFIX(_dispatch_stub_814)
+	.type	GL_PREFIX(_dispatch_stub_814), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_814))
+GL_PREFIX(_dispatch_stub_814):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6400(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30260,13 +30774,13 @@ GL_PREFIX(_dispatch_stub_800):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6400(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30276,10 +30790,10 @@ GL_PREFIX(_dispatch_stub_800):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_800), .-GL_PREFIX(_dispatch_stub_800)
+	.size	GL_PREFIX(_dispatch_stub_814), .-GL_PREFIX(_dispatch_stub_814)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -30287,7 +30801,7 @@ GL_PREFIX(_dispatch_stub_800):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6408(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30297,13 +30811,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6408(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30313,7 +30827,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -30324,7 +30838,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6416(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30334,13 +30848,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6416(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30350,7 +30864,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -30361,25 +30875,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6424(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6424(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -30390,7 +30904,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30400,13 +30914,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30416,7 +30930,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -30427,7 +30941,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6440(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30437,13 +30951,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6440(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30453,7 +30967,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -30464,7 +30978,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6448(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30478,13 +30992,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6448(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30498,7 +31012,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -30509,7 +31023,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6456(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30523,13 +31037,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6456(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30543,7 +31057,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -30554,7 +31068,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6464(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30568,13 +31082,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6464(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30588,7 +31102,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -30599,7 +31113,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6472(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30617,13 +31131,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6472(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30641,7 +31155,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -30652,7 +31166,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6480(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30662,13 +31176,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6480(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30678,7 +31192,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -30689,7 +31203,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6488(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30699,13 +31213,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6488(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6488(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30715,7 +31229,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6488(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -30726,25 +31240,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6496(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6496(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -30755,7 +31269,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6504(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30769,13 +31283,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6504(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30789,7 +31303,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -30800,7 +31314,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6512(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30810,13 +31324,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6512(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30826,7 +31340,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -30837,25 +31351,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6520(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6520(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -30866,25 +31380,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6528(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6528(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -30895,7 +31409,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6536(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30909,13 +31423,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6536(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6536(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30929,19 +31443,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6536(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_818)
-	.type	GL_PREFIX(_dispatch_stub_818), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_818))
-GL_PREFIX(_dispatch_stub_818):
+	.globl	GL_PREFIX(_dispatch_stub_832)
+	.type	GL_PREFIX(_dispatch_stub_832), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_832))
+GL_PREFIX(_dispatch_stub_832):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6544(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30959,13 +31473,13 @@ GL_PREFIX(_dispatch_stub_818):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6544(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30983,19 +31497,19 @@ GL_PREFIX(_dispatch_stub_818):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_818), .-GL_PREFIX(_dispatch_stub_818)
+	.size	GL_PREFIX(_dispatch_stub_832), .-GL_PREFIX(_dispatch_stub_832)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_819)
-	.type	GL_PREFIX(_dispatch_stub_819), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_819))
-GL_PREFIX(_dispatch_stub_819):
+	.globl	GL_PREFIX(_dispatch_stub_833)
+	.type	GL_PREFIX(_dispatch_stub_833), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_833))
+GL_PREFIX(_dispatch_stub_833):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6552(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31005,13 +31519,13 @@ GL_PREFIX(_dispatch_stub_819):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6552(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31021,19 +31535,19 @@ GL_PREFIX(_dispatch_stub_819):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_819), .-GL_PREFIX(_dispatch_stub_819)
+	.size	GL_PREFIX(_dispatch_stub_833), .-GL_PREFIX(_dispatch_stub_833)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_820)
-	.type	GL_PREFIX(_dispatch_stub_820), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_820))
-GL_PREFIX(_dispatch_stub_820):
+	.globl	GL_PREFIX(_dispatch_stub_834)
+	.type	GL_PREFIX(_dispatch_stub_834), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_834))
+GL_PREFIX(_dispatch_stub_834):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6560(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31043,13 +31557,13 @@ GL_PREFIX(_dispatch_stub_820):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6560(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31059,10 +31573,10 @@ GL_PREFIX(_dispatch_stub_820):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_820), .-GL_PREFIX(_dispatch_stub_820)
+	.size	GL_PREFIX(_dispatch_stub_834), .-GL_PREFIX(_dispatch_stub_834)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFragDataLocationEXT)
@@ -31070,7 +31584,7 @@ GL_PREFIX(_dispatch_stub_820):
 GL_PREFIX(BindFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6568(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31080,13 +31594,13 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6568(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31096,7 +31610,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragDataLocationEXT), .-GL_PREFIX(BindFragDataLocationEXT)
@@ -31107,7 +31621,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 GL_PREFIX(GetFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6576(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31117,13 +31631,13 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6576(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31133,7 +31647,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFragDataLocationEXT), .-GL_PREFIX(GetFragDataLocationEXT)
@@ -31144,7 +31658,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 GL_PREFIX(GetUniformuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6584(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31154,13 +31668,13 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6584(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6584(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31170,7 +31684,7 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6584(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformuivEXT), .-GL_PREFIX(GetUniformuivEXT)
@@ -31181,7 +31695,7 @@ GL_PREFIX(GetUniformuivEXT):
 GL_PREFIX(GetVertexAttribIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6592(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31191,13 +31705,13 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6592(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31207,7 +31721,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIivEXT), .-GL_PREFIX(GetVertexAttribIivEXT)
@@ -31218,7 +31732,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 GL_PREFIX(GetVertexAttribIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6600(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31228,13 +31742,13 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6600(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6600(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31244,7 +31758,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6600(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIuivEXT), .-GL_PREFIX(GetVertexAttribIuivEXT)
@@ -31255,7 +31769,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 GL_PREFIX(Uniform1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6608(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31265,13 +31779,13 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6608(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31281,7 +31795,7 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uiEXT), .-GL_PREFIX(Uniform1uiEXT)
@@ -31292,7 +31806,7 @@ GL_PREFIX(Uniform1uiEXT):
 GL_PREFIX(Uniform1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6616(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31302,13 +31816,13 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6616(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31318,7 +31832,7 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uivEXT), .-GL_PREFIX(Uniform1uivEXT)
@@ -31329,7 +31843,7 @@ GL_PREFIX(Uniform1uivEXT):
 GL_PREFIX(Uniform2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6624(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31339,13 +31853,13 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6624(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31355,7 +31869,7 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uiEXT), .-GL_PREFIX(Uniform2uiEXT)
@@ -31366,7 +31880,7 @@ GL_PREFIX(Uniform2uiEXT):
 GL_PREFIX(Uniform2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6632(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31376,13 +31890,13 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6632(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6632(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31392,7 +31906,7 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6632(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uivEXT), .-GL_PREFIX(Uniform2uivEXT)
@@ -31403,7 +31917,7 @@ GL_PREFIX(Uniform2uivEXT):
 GL_PREFIX(Uniform3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6640(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31417,13 +31931,13 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6640(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31437,7 +31951,7 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uiEXT), .-GL_PREFIX(Uniform3uiEXT)
@@ -31448,7 +31962,7 @@ GL_PREFIX(Uniform3uiEXT):
 GL_PREFIX(Uniform3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6648(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31458,13 +31972,13 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6648(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31474,7 +31988,7 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uivEXT), .-GL_PREFIX(Uniform3uivEXT)
@@ -31485,7 +31999,7 @@ GL_PREFIX(Uniform3uivEXT):
 GL_PREFIX(Uniform4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6656(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31499,13 +32013,13 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6656(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31519,7 +32033,7 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uiEXT), .-GL_PREFIX(Uniform4uiEXT)
@@ -31530,7 +32044,7 @@ GL_PREFIX(Uniform4uiEXT):
 GL_PREFIX(Uniform4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6664(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31540,13 +32054,13 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6664(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31556,7 +32070,7 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uivEXT), .-GL_PREFIX(Uniform4uivEXT)
@@ -31567,7 +32081,7 @@ GL_PREFIX(Uniform4uivEXT):
 GL_PREFIX(VertexAttribI1iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6672(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31577,13 +32091,13 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6672(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31593,7 +32107,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1iEXT), .-GL_PREFIX(VertexAttribI1iEXT)
@@ -31604,7 +32118,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 GL_PREFIX(VertexAttribI1ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6680(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31614,13 +32128,13 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6680(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31630,7 +32144,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1ivEXT), .-GL_PREFIX(VertexAttribI1ivEXT)
@@ -31641,7 +32155,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 GL_PREFIX(VertexAttribI1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6688(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31651,13 +32165,13 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6688(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31667,7 +32181,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uiEXT), .-GL_PREFIX(VertexAttribI1uiEXT)
@@ -31678,7 +32192,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 GL_PREFIX(VertexAttribI1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6696(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31688,13 +32202,13 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6696(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31704,7 +32218,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uivEXT), .-GL_PREFIX(VertexAttribI1uivEXT)
@@ -31715,7 +32229,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 GL_PREFIX(VertexAttribI2iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6704(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31725,13 +32239,13 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6704(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31741,7 +32255,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2iEXT), .-GL_PREFIX(VertexAttribI2iEXT)
@@ -31752,7 +32266,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 GL_PREFIX(VertexAttribI2ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6712(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31762,13 +32276,13 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6712(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31778,7 +32292,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2ivEXT), .-GL_PREFIX(VertexAttribI2ivEXT)
@@ -31789,7 +32303,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 GL_PREFIX(VertexAttribI2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6720(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31799,13 +32313,13 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6720(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31815,7 +32329,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uiEXT), .-GL_PREFIX(VertexAttribI2uiEXT)
@@ -31826,7 +32340,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 GL_PREFIX(VertexAttribI2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6728(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31836,13 +32350,13 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6728(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31852,7 +32366,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uivEXT), .-GL_PREFIX(VertexAttribI2uivEXT)
@@ -31863,7 +32377,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 GL_PREFIX(VertexAttribI3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6736(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31877,13 +32391,13 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6736(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31897,7 +32411,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3iEXT), .-GL_PREFIX(VertexAttribI3iEXT)
@@ -31908,7 +32422,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 GL_PREFIX(VertexAttribI3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6744(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31918,13 +32432,13 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6744(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31934,7 +32448,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3ivEXT), .-GL_PREFIX(VertexAttribI3ivEXT)
@@ -31945,7 +32459,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 GL_PREFIX(VertexAttribI3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6752(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31959,13 +32473,13 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6752(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31979,7 +32493,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uiEXT), .-GL_PREFIX(VertexAttribI3uiEXT)
@@ -31990,7 +32504,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 GL_PREFIX(VertexAttribI3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6760(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32000,13 +32514,13 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6760(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32016,7 +32530,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uivEXT), .-GL_PREFIX(VertexAttribI3uivEXT)
@@ -32027,7 +32541,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 GL_PREFIX(VertexAttribI4bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6768(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32037,13 +32551,13 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6768(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32053,7 +32567,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4bvEXT), .-GL_PREFIX(VertexAttribI4bvEXT)
@@ -32064,7 +32578,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 GL_PREFIX(VertexAttribI4iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6776(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32078,13 +32592,13 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6776(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32098,7 +32612,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4iEXT), .-GL_PREFIX(VertexAttribI4iEXT)
@@ -32109,7 +32623,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 GL_PREFIX(VertexAttribI4ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6784(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32119,13 +32633,13 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6784(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32135,7 +32649,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ivEXT), .-GL_PREFIX(VertexAttribI4ivEXT)
@@ -32146,7 +32660,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 GL_PREFIX(VertexAttribI4svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6792(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32156,13 +32670,13 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6792(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32172,7 +32686,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4svEXT), .-GL_PREFIX(VertexAttribI4svEXT)
@@ -32183,7 +32697,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 GL_PREFIX(VertexAttribI4ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6800(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32193,13 +32707,13 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6800(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32209,7 +32723,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ubvEXT), .-GL_PREFIX(VertexAttribI4ubvEXT)
@@ -32220,7 +32734,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 GL_PREFIX(VertexAttribI4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6808(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32234,13 +32748,13 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6808(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32254,7 +32768,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uiEXT), .-GL_PREFIX(VertexAttribI4uiEXT)
@@ -32265,7 +32779,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 GL_PREFIX(VertexAttribI4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6816(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32275,13 +32789,13 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6816(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32291,7 +32805,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uivEXT), .-GL_PREFIX(VertexAttribI4uivEXT)
@@ -32302,7 +32816,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 GL_PREFIX(VertexAttribI4usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6824(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32312,13 +32826,13 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6824(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32328,7 +32842,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4usvEXT), .-GL_PREFIX(VertexAttribI4usvEXT)
@@ -32339,7 +32853,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 GL_PREFIX(VertexAttribIPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6832(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32353,13 +32867,13 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6832(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32373,7 +32887,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribIPointerEXT), .-GL_PREFIX(VertexAttribIPointerEXT)
@@ -32384,7 +32898,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6840(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32398,13 +32912,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6840(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32418,7 +32932,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -32429,7 +32943,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6848(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32443,13 +32957,13 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6848(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32463,7 +32977,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
@@ -32474,7 +32988,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6856(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32484,13 +32998,13 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6856(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32500,7 +33014,7 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
@@ -32511,7 +33025,7 @@ GL_PREFIX(DisableIndexedEXT):
 GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6864(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32521,13 +33035,13 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6864(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6864(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32537,7 +33051,7 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6864(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
@@ -32548,7 +33062,7 @@ GL_PREFIX(EnableIndexedEXT):
 GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6872(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32558,13 +33072,13 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6872(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32574,7 +33088,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
@@ -32585,7 +33099,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 GL_PREFIX(GetIntegerIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6880(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32595,13 +33109,13 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6880(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32611,7 +33125,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
@@ -32622,7 +33136,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 GL_PREFIX(IsEnabledIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6888(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32632,13 +33146,13 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6888(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32648,7 +33162,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
@@ -32659,7 +33173,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 GL_PREFIX(ClearColorIiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6896(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32673,13 +33187,13 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6896(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32693,7 +33207,7 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIiEXT), .-GL_PREFIX(ClearColorIiEXT)
@@ -32704,7 +33218,7 @@ GL_PREFIX(ClearColorIiEXT):
 GL_PREFIX(ClearColorIuiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6904(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32718,13 +33232,13 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6904(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32738,7 +33252,7 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIuiEXT), .-GL_PREFIX(ClearColorIuiEXT)
@@ -32749,7 +33263,7 @@ GL_PREFIX(ClearColorIuiEXT):
 GL_PREFIX(GetTexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6912(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32759,13 +33273,13 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6912(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32775,7 +33289,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIivEXT), .-GL_PREFIX(GetTexParameterIivEXT)
@@ -32786,7 +33300,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 GL_PREFIX(GetTexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6920(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32796,13 +33310,13 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6920(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32812,7 +33326,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIuivEXT), .-GL_PREFIX(GetTexParameterIuivEXT)
@@ -32823,7 +33337,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 GL_PREFIX(TexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6928(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32833,13 +33347,13 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6928(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32849,7 +33363,7 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIivEXT), .-GL_PREFIX(TexParameterIivEXT)
@@ -32860,7 +33374,7 @@ GL_PREFIX(TexParameterIivEXT):
 GL_PREFIX(TexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6936(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32870,13 +33384,13 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6936(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32886,7 +33400,7 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIuivEXT), .-GL_PREFIX(TexParameterIuivEXT)
@@ -32897,7 +33411,7 @@ GL_PREFIX(TexParameterIuivEXT):
 GL_PREFIX(BeginConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6944(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32907,13 +33421,13 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6944(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32923,7 +33437,7 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginConditionalRenderNV), .-GL_PREFIX(BeginConditionalRenderNV)
@@ -32934,25 +33448,25 @@ GL_PREFIX(BeginConditionalRenderNV):
 GL_PREFIX(EndConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6952(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6952(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6952(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6952(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndConditionalRenderNV), .-GL_PREFIX(EndConditionalRenderNV)
@@ -32963,25 +33477,25 @@ GL_PREFIX(EndConditionalRenderNV):
 GL_PREFIX(BeginTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6960(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6960(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginTransformFeedbackEXT), .-GL_PREFIX(BeginTransformFeedbackEXT)
@@ -32992,7 +33506,7 @@ GL_PREFIX(BeginTransformFeedbackEXT):
 GL_PREFIX(BindBufferBaseEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6968(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33002,13 +33516,13 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6968(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33018,7 +33532,7 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferBaseEXT), .-GL_PREFIX(BindBufferBaseEXT)
@@ -33029,7 +33543,7 @@ GL_PREFIX(BindBufferBaseEXT):
 GL_PREFIX(BindBufferOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6976(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33043,13 +33557,13 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6976(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6976(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33063,7 +33577,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6976(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferOffsetEXT), .-GL_PREFIX(BindBufferOffsetEXT)
@@ -33074,7 +33588,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 GL_PREFIX(BindBufferRangeEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6984(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33088,13 +33602,13 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6984(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33108,7 +33622,7 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferRangeEXT), .-GL_PREFIX(BindBufferRangeEXT)
@@ -33119,25 +33633,25 @@ GL_PREFIX(BindBufferRangeEXT):
 GL_PREFIX(EndTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6992(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6992(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6992(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6992(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndTransformFeedbackEXT), .-GL_PREFIX(EndTransformFeedbackEXT)
@@ -33148,7 +33662,7 @@ GL_PREFIX(EndTransformFeedbackEXT):
 GL_PREFIX(GetTransformFeedbackVaryingEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7000(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33166,13 +33680,13 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7000(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33190,7 +33704,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTransformFeedbackVaryingEXT), .-GL_PREFIX(GetTransformFeedbackVaryingEXT)
@@ -33201,7 +33715,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 GL_PREFIX(TransformFeedbackVaryingsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7008(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33215,13 +33729,13 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7008(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33235,7 +33749,7 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TransformFeedbackVaryingsEXT), .-GL_PREFIX(TransformFeedbackVaryingsEXT)
@@ -33246,37 +33760,37 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7016(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7016(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_878)
-	.type	GL_PREFIX(_dispatch_stub_878), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_878))
-GL_PREFIX(_dispatch_stub_878):
+	.globl	GL_PREFIX(_dispatch_stub_892)
+	.type	GL_PREFIX(_dispatch_stub_892), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_892))
+GL_PREFIX(_dispatch_stub_892):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7024(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33286,13 +33800,13 @@ GL_PREFIX(_dispatch_stub_878):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7024(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7024(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33302,19 +33816,19 @@ GL_PREFIX(_dispatch_stub_878):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7024(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_878), .-GL_PREFIX(_dispatch_stub_878)
+	.size	GL_PREFIX(_dispatch_stub_892), .-GL_PREFIX(_dispatch_stub_892)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_879)
-	.type	GL_PREFIX(_dispatch_stub_879), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_879))
-GL_PREFIX(_dispatch_stub_879):
+	.globl	GL_PREFIX(_dispatch_stub_893)
+	.type	GL_PREFIX(_dispatch_stub_893), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_893))
+GL_PREFIX(_dispatch_stub_893):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7032(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33324,13 +33838,13 @@ GL_PREFIX(_dispatch_stub_879):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7032(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33340,10 +33854,10 @@ GL_PREFIX(_dispatch_stub_879):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_879), .-GL_PREFIX(_dispatch_stub_879)
+	.size	GL_PREFIX(_dispatch_stub_893), .-GL_PREFIX(_dispatch_stub_893)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
@@ -33351,7 +33865,7 @@ GL_PREFIX(_dispatch_stub_879):
 GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7040(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33365,13 +33879,13 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7040(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33385,7 +33899,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
@@ -33396,7 +33910,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7048(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33406,13 +33920,13 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7048(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33422,7 +33936,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
@@ -33433,7 +33947,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7056(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33443,13 +33957,13 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7056(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33459,7 +33973,7 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
@@ -33470,25 +33984,25 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 GL_PREFIX(ActiveProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7064(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7064(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ActiveProgramEXT), .-GL_PREFIX(ActiveProgramEXT)
@@ -33499,7 +34013,7 @@ GL_PREFIX(ActiveProgramEXT):
 GL_PREFIX(CreateShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7072(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33509,13 +34023,13 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7072(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33525,7 +34039,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateShaderProgramEXT), .-GL_PREFIX(CreateShaderProgramEXT)
@@ -33536,7 +34050,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 GL_PREFIX(UseShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7080(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33546,13 +34060,13 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7080(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33562,7 +34076,7 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UseShaderProgramEXT), .-GL_PREFIX(UseShaderProgramEXT)
@@ -33573,37 +34087,37 @@ GL_PREFIX(UseShaderProgramEXT):
 GL_PREFIX(TextureBarrierNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7088(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7088(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7088(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7088(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureBarrierNV), .-GL_PREFIX(TextureBarrierNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_887)
-	.type	GL_PREFIX(_dispatch_stub_887), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_887))
-GL_PREFIX(_dispatch_stub_887):
+	.globl	GL_PREFIX(_dispatch_stub_901)
+	.type	GL_PREFIX(_dispatch_stub_901), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_901))
+GL_PREFIX(_dispatch_stub_901):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7096(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33617,13 +34131,13 @@ GL_PREFIX(_dispatch_stub_887):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7096(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33637,19 +34151,19 @@ GL_PREFIX(_dispatch_stub_887):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_887), .-GL_PREFIX(_dispatch_stub_887)
+	.size	GL_PREFIX(_dispatch_stub_901), .-GL_PREFIX(_dispatch_stub_901)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_888)
-	.type	GL_PREFIX(_dispatch_stub_888), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_888))
-GL_PREFIX(_dispatch_stub_888):
+	.globl	GL_PREFIX(_dispatch_stub_902)
+	.type	GL_PREFIX(_dispatch_stub_902), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_902))
+GL_PREFIX(_dispatch_stub_902):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7104(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33663,13 +34177,13 @@ GL_PREFIX(_dispatch_stub_888):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7104(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33683,19 +34197,19 @@ GL_PREFIX(_dispatch_stub_888):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_888), .-GL_PREFIX(_dispatch_stub_888)
+	.size	GL_PREFIX(_dispatch_stub_902), .-GL_PREFIX(_dispatch_stub_902)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_889)
-	.type	GL_PREFIX(_dispatch_stub_889), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_889))
-GL_PREFIX(_dispatch_stub_889):
+	.globl	GL_PREFIX(_dispatch_stub_903)
+	.type	GL_PREFIX(_dispatch_stub_903), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_903))
+GL_PREFIX(_dispatch_stub_903):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7112(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33709,13 +34223,13 @@ GL_PREFIX(_dispatch_stub_889):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7112(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33729,19 +34243,19 @@ GL_PREFIX(_dispatch_stub_889):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_889), .-GL_PREFIX(_dispatch_stub_889)
+	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_890)
-	.type	GL_PREFIX(_dispatch_stub_890), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_890))
-GL_PREFIX(_dispatch_stub_890):
+	.globl	GL_PREFIX(_dispatch_stub_904)
+	.type	GL_PREFIX(_dispatch_stub_904), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_904))
+GL_PREFIX(_dispatch_stub_904):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7120(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33751,13 +34265,13 @@ GL_PREFIX(_dispatch_stub_890):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7120(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33767,19 +34281,19 @@ GL_PREFIX(_dispatch_stub_890):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_890), .-GL_PREFIX(_dispatch_stub_890)
+	.size	GL_PREFIX(_dispatch_stub_904), .-GL_PREFIX(_dispatch_stub_904)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_891)
-	.type	GL_PREFIX(_dispatch_stub_891), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_891))
-GL_PREFIX(_dispatch_stub_891):
+	.globl	GL_PREFIX(_dispatch_stub_905)
+	.type	GL_PREFIX(_dispatch_stub_905), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_905))
+GL_PREFIX(_dispatch_stub_905):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7128(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33789,13 +34303,13 @@ GL_PREFIX(_dispatch_stub_891):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7128(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33805,10 +34319,10 @@ GL_PREFIX(_dispatch_stub_891):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_891), .-GL_PREFIX(_dispatch_stub_891)
+	.size	GL_PREFIX(_dispatch_stub_905), .-GL_PREFIX(_dispatch_stub_905)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -33816,7 +34330,7 @@ GL_PREFIX(_dispatch_stub_891):
 GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7136(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33826,13 +34340,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7136(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33842,7 +34356,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -33853,7 +34367,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7144(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33863,13 +34377,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7144(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33879,7 +34393,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
@@ -34142,10 +34656,10 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_788)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_790)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_802)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_804)
 	.globl GL_PREFIX(PrimitiveRestartIndex) ; .set GL_PREFIX(PrimitiveRestartIndex), GL_PREFIX(PrimitiveRestartIndexNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_800)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_814)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -34163,7 +34677,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_818)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_832)
 	.globl GL_PREFIX(BindFragDataLocation) ; .set GL_PREFIX(BindFragDataLocation), GL_PREFIX(BindFragDataLocationEXT)
 	.globl GL_PREFIX(GetFragDataLocation) ; .set GL_PREFIX(GetFragDataLocation), GL_PREFIX(GetFragDataLocationEXT)
 	.globl GL_PREFIX(GetUniformuiv) ; .set GL_PREFIX(GetUniformuiv), GL_PREFIX(GetUniformuivEXT)
diff --git a/src/mapi/glapi/glapi_x86.S b/src/mapi/glapi/glapi_x86.S
index f46ac5fcd94..f56dc748dee 100644
--- a/src/mapi/glapi/glapi_x86.S
+++ b/src/mapi/glapi/glapi_x86.S
@@ -750,335 +750,349 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(BlendEquationiARB, 597, BlendEquationiARB@8)
 	GL_STUB(BlendFuncSeparateiARB, 598, BlendFuncSeparateiARB@20)
 	GL_STUB(BlendFunciARB, 599, BlendFunciARB@12)
-	GL_STUB(BindTransformFeedback, 600, BindTransformFeedback@8)
-	GL_STUB(DeleteTransformFeedbacks, 601, DeleteTransformFeedbacks@8)
-	GL_STUB(DrawTransformFeedback, 602, DrawTransformFeedback@8)
-	GL_STUB(GenTransformFeedbacks, 603, GenTransformFeedbacks@8)
-	GL_STUB(IsTransformFeedback, 604, IsTransformFeedback@4)
-	GL_STUB(PauseTransformFeedback, 605, PauseTransformFeedback@0)
-	GL_STUB(ResumeTransformFeedback, 606, ResumeTransformFeedback@0)
-	GL_STUB(ClearDepthf, 607, ClearDepthf@4)
-	GL_STUB(DepthRangef, 608, DepthRangef@8)
-	GL_STUB(GetShaderPrecisionFormat, 609, GetShaderPrecisionFormat@16)
-	GL_STUB(ReleaseShaderCompiler, 610, ReleaseShaderCompiler@0)
-	GL_STUB(ShaderBinary, 611, ShaderBinary@20)
-	GL_STUB(PolygonOffsetEXT, 612, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_613, 613, _dispatch_stub_613@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_613, _dispatch_stub_613@8))
-	GL_STUB(_dispatch_stub_614, 614, _dispatch_stub_614@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_614, _dispatch_stub_614@8))
-	GL_STUB(_dispatch_stub_615, 615, _dispatch_stub_615@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_615, _dispatch_stub_615@8))
-	GL_STUB(_dispatch_stub_616, 616, _dispatch_stub_616@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_616, _dispatch_stub_616@8))
-	GL_STUB(_dispatch_stub_617, 617, _dispatch_stub_617@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_617, _dispatch_stub_617@8))
-	GL_STUB(_dispatch_stub_618, 618, _dispatch_stub_618@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_618, _dispatch_stub_618@8))
-	GL_STUB(_dispatch_stub_619, 619, _dispatch_stub_619@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_619, _dispatch_stub_619@8))
-	GL_STUB(_dispatch_stub_620, 620, _dispatch_stub_620@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_620, _dispatch_stub_620@4))
-	GL_STUB(ColorPointerEXT, 621, ColorPointerEXT@20)
-	GL_STUB(EdgeFlagPointerEXT, 622, EdgeFlagPointerEXT@12)
-	GL_STUB(IndexPointerEXT, 623, IndexPointerEXT@16)
-	GL_STUB(NormalPointerEXT, 624, NormalPointerEXT@16)
-	GL_STUB(TexCoordPointerEXT, 625, TexCoordPointerEXT@20)
-	GL_STUB(VertexPointerEXT, 626, VertexPointerEXT@20)
-	GL_STUB(PointParameterfEXT, 627, PointParameterfEXT@8)
-	GL_STUB(PointParameterfvEXT, 628, PointParameterfvEXT@8)
-	GL_STUB(LockArraysEXT, 629, LockArraysEXT@8)
-	GL_STUB(UnlockArraysEXT, 630, UnlockArraysEXT@0)
-	GL_STUB(SecondaryColor3bEXT, 631, SecondaryColor3bEXT@12)
-	GL_STUB(SecondaryColor3bvEXT, 632, SecondaryColor3bvEXT@4)
-	GL_STUB(SecondaryColor3dEXT, 633, SecondaryColor3dEXT@24)
-	GL_STUB(SecondaryColor3dvEXT, 634, SecondaryColor3dvEXT@4)
-	GL_STUB(SecondaryColor3fEXT, 635, SecondaryColor3fEXT@12)
-	GL_STUB(SecondaryColor3fvEXT, 636, SecondaryColor3fvEXT@4)
-	GL_STUB(SecondaryColor3iEXT, 637, SecondaryColor3iEXT@12)
-	GL_STUB(SecondaryColor3ivEXT, 638, SecondaryColor3ivEXT@4)
-	GL_STUB(SecondaryColor3sEXT, 639, SecondaryColor3sEXT@12)
-	GL_STUB(SecondaryColor3svEXT, 640, SecondaryColor3svEXT@4)
-	GL_STUB(SecondaryColor3ubEXT, 641, SecondaryColor3ubEXT@12)
-	GL_STUB(SecondaryColor3ubvEXT, 642, SecondaryColor3ubvEXT@4)
-	GL_STUB(SecondaryColor3uiEXT, 643, SecondaryColor3uiEXT@12)
-	GL_STUB(SecondaryColor3uivEXT, 644, SecondaryColor3uivEXT@4)
-	GL_STUB(SecondaryColor3usEXT, 645, SecondaryColor3usEXT@12)
-	GL_STUB(SecondaryColor3usvEXT, 646, SecondaryColor3usvEXT@4)
-	GL_STUB(SecondaryColorPointerEXT, 647, SecondaryColorPointerEXT@16)
-	GL_STUB(MultiDrawArraysEXT, 648, MultiDrawArraysEXT@16)
-	GL_STUB(MultiDrawElementsEXT, 649, MultiDrawElementsEXT@20)
-	GL_STUB(FogCoordPointerEXT, 650, FogCoordPointerEXT@12)
-	GL_STUB(FogCoorddEXT, 651, FogCoorddEXT@8)
-	GL_STUB(FogCoorddvEXT, 652, FogCoorddvEXT@4)
-	GL_STUB(FogCoordfEXT, 653, FogCoordfEXT@4)
-	GL_STUB(FogCoordfvEXT, 654, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_655, 655, _dispatch_stub_655@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
-	GL_STUB(BlendFuncSeparateEXT, 656, BlendFuncSeparateEXT@16)
-	GL_STUB(FlushVertexArrayRangeNV, 657, FlushVertexArrayRangeNV@0)
-	GL_STUB(VertexArrayRangeNV, 658, VertexArrayRangeNV@8)
-	GL_STUB(CombinerInputNV, 659, CombinerInputNV@24)
-	GL_STUB(CombinerOutputNV, 660, CombinerOutputNV@40)
-	GL_STUB(CombinerParameterfNV, 661, CombinerParameterfNV@8)
-	GL_STUB(CombinerParameterfvNV, 662, CombinerParameterfvNV@8)
-	GL_STUB(CombinerParameteriNV, 663, CombinerParameteriNV@8)
-	GL_STUB(CombinerParameterivNV, 664, CombinerParameterivNV@8)
-	GL_STUB(FinalCombinerInputNV, 665, FinalCombinerInputNV@16)
-	GL_STUB(GetCombinerInputParameterfvNV, 666, GetCombinerInputParameterfvNV@20)
-	GL_STUB(GetCombinerInputParameterivNV, 667, GetCombinerInputParameterivNV@20)
-	GL_STUB(GetCombinerOutputParameterfvNV, 668, GetCombinerOutputParameterfvNV@16)
-	GL_STUB(GetCombinerOutputParameterivNV, 669, GetCombinerOutputParameterivNV@16)
-	GL_STUB(GetFinalCombinerInputParameterfvNV, 670, GetFinalCombinerInputParameterfvNV@12)
-	GL_STUB(GetFinalCombinerInputParameterivNV, 671, GetFinalCombinerInputParameterivNV@12)
-	GL_STUB(ResizeBuffersMESA, 672, ResizeBuffersMESA@0)
-	GL_STUB(WindowPos2dMESA, 673, WindowPos2dMESA@16)
-	GL_STUB(WindowPos2dvMESA, 674, WindowPos2dvMESA@4)
-	GL_STUB(WindowPos2fMESA, 675, WindowPos2fMESA@8)
-	GL_STUB(WindowPos2fvMESA, 676, WindowPos2fvMESA@4)
-	GL_STUB(WindowPos2iMESA, 677, WindowPos2iMESA@8)
-	GL_STUB(WindowPos2ivMESA, 678, WindowPos2ivMESA@4)
-	GL_STUB(WindowPos2sMESA, 679, WindowPos2sMESA@8)
-	GL_STUB(WindowPos2svMESA, 680, WindowPos2svMESA@4)
-	GL_STUB(WindowPos3dMESA, 681, WindowPos3dMESA@24)
-	GL_STUB(WindowPos3dvMESA, 682, WindowPos3dvMESA@4)
-	GL_STUB(WindowPos3fMESA, 683, WindowPos3fMESA@12)
-	GL_STUB(WindowPos3fvMESA, 684, WindowPos3fvMESA@4)
-	GL_STUB(WindowPos3iMESA, 685, WindowPos3iMESA@12)
-	GL_STUB(WindowPos3ivMESA, 686, WindowPos3ivMESA@4)
-	GL_STUB(WindowPos3sMESA, 687, WindowPos3sMESA@12)
-	GL_STUB(WindowPos3svMESA, 688, WindowPos3svMESA@4)
-	GL_STUB(WindowPos4dMESA, 689, WindowPos4dMESA@32)
-	GL_STUB(WindowPos4dvMESA, 690, WindowPos4dvMESA@4)
-	GL_STUB(WindowPos4fMESA, 691, WindowPos4fMESA@16)
-	GL_STUB(WindowPos4fvMESA, 692, WindowPos4fvMESA@4)
-	GL_STUB(WindowPos4iMESA, 693, WindowPos4iMESA@16)
-	GL_STUB(WindowPos4ivMESA, 694, WindowPos4ivMESA@4)
-	GL_STUB(WindowPos4sMESA, 695, WindowPos4sMESA@16)
-	GL_STUB(WindowPos4svMESA, 696, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_697, 697, _dispatch_stub_697@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_697, _dispatch_stub_697@20))
-	GL_STUB(_dispatch_stub_698, 698, _dispatch_stub_698@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_698, _dispatch_stub_698@24))
-	GL_STUB(_dispatch_stub_699, 699, _dispatch_stub_699@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_699, _dispatch_stub_699@8))
-	GL_STUB(_dispatch_stub_700, 700, _dispatch_stub_700@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_700, _dispatch_stub_700@4))
-	GL_STUB(_dispatch_stub_701, 701, _dispatch_stub_701@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_701, _dispatch_stub_701@8))
-	GL_STUB(_dispatch_stub_702, 702, _dispatch_stub_702@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_702, _dispatch_stub_702@12))
-	GL_STUB(_dispatch_stub_703, 703, _dispatch_stub_703@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_703, _dispatch_stub_703@4))
-	GL_STUB(_dispatch_stub_704, 704, _dispatch_stub_704@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_704, _dispatch_stub_704@8))
-	GL_STUB(_dispatch_stub_705, 705, _dispatch_stub_705@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_705, _dispatch_stub_705@4))
-	GL_STUB(AreProgramsResidentNV, 706, AreProgramsResidentNV@12)
-	GL_STUB(BindProgramNV, 707, BindProgramNV@8)
-	GL_STUB(DeleteProgramsNV, 708, DeleteProgramsNV@8)
-	GL_STUB(ExecuteProgramNV, 709, ExecuteProgramNV@12)
-	GL_STUB(GenProgramsNV, 710, GenProgramsNV@8)
-	GL_STUB(GetProgramParameterdvNV, 711, GetProgramParameterdvNV@16)
-	GL_STUB(GetProgramParameterfvNV, 712, GetProgramParameterfvNV@16)
-	GL_STUB(GetProgramStringNV, 713, GetProgramStringNV@12)
-	GL_STUB(GetProgramivNV, 714, GetProgramivNV@12)
-	GL_STUB(GetTrackMatrixivNV, 715, GetTrackMatrixivNV@16)
-	GL_STUB(GetVertexAttribPointervNV, 716, GetVertexAttribPointervNV@12)
-	GL_STUB(GetVertexAttribdvNV, 717, GetVertexAttribdvNV@12)
-	GL_STUB(GetVertexAttribfvNV, 718, GetVertexAttribfvNV@12)
-	GL_STUB(GetVertexAttribivNV, 719, GetVertexAttribivNV@12)
-	GL_STUB(IsProgramNV, 720, IsProgramNV@4)
-	GL_STUB(LoadProgramNV, 721, LoadProgramNV@16)
-	GL_STUB(ProgramParameters4dvNV, 722, ProgramParameters4dvNV@16)
-	GL_STUB(ProgramParameters4fvNV, 723, ProgramParameters4fvNV@16)
-	GL_STUB(RequestResidentProgramsNV, 724, RequestResidentProgramsNV@8)
-	GL_STUB(TrackMatrixNV, 725, TrackMatrixNV@16)
-	GL_STUB(VertexAttrib1dNV, 726, VertexAttrib1dNV@12)
-	GL_STUB(VertexAttrib1dvNV, 727, VertexAttrib1dvNV@8)
-	GL_STUB(VertexAttrib1fNV, 728, VertexAttrib1fNV@8)
-	GL_STUB(VertexAttrib1fvNV, 729, VertexAttrib1fvNV@8)
-	GL_STUB(VertexAttrib1sNV, 730, VertexAttrib1sNV@8)
-	GL_STUB(VertexAttrib1svNV, 731, VertexAttrib1svNV@8)
-	GL_STUB(VertexAttrib2dNV, 732, VertexAttrib2dNV@20)
-	GL_STUB(VertexAttrib2dvNV, 733, VertexAttrib2dvNV@8)
-	GL_STUB(VertexAttrib2fNV, 734, VertexAttrib2fNV@12)
-	GL_STUB(VertexAttrib2fvNV, 735, VertexAttrib2fvNV@8)
-	GL_STUB(VertexAttrib2sNV, 736, VertexAttrib2sNV@12)
-	GL_STUB(VertexAttrib2svNV, 737, VertexAttrib2svNV@8)
-	GL_STUB(VertexAttrib3dNV, 738, VertexAttrib3dNV@28)
-	GL_STUB(VertexAttrib3dvNV, 739, VertexAttrib3dvNV@8)
-	GL_STUB(VertexAttrib3fNV, 740, VertexAttrib3fNV@16)
-	GL_STUB(VertexAttrib3fvNV, 741, VertexAttrib3fvNV@8)
-	GL_STUB(VertexAttrib3sNV, 742, VertexAttrib3sNV@16)
-	GL_STUB(VertexAttrib3svNV, 743, VertexAttrib3svNV@8)
-	GL_STUB(VertexAttrib4dNV, 744, VertexAttrib4dNV@36)
-	GL_STUB(VertexAttrib4dvNV, 745, VertexAttrib4dvNV@8)
-	GL_STUB(VertexAttrib4fNV, 746, VertexAttrib4fNV@20)
-	GL_STUB(VertexAttrib4fvNV, 747, VertexAttrib4fvNV@8)
-	GL_STUB(VertexAttrib4sNV, 748, VertexAttrib4sNV@20)
-	GL_STUB(VertexAttrib4svNV, 749, VertexAttrib4svNV@8)
-	GL_STUB(VertexAttrib4ubNV, 750, VertexAttrib4ubNV@20)
-	GL_STUB(VertexAttrib4ubvNV, 751, VertexAttrib4ubvNV@8)
-	GL_STUB(VertexAttribPointerNV, 752, VertexAttribPointerNV@20)
-	GL_STUB(VertexAttribs1dvNV, 753, VertexAttribs1dvNV@12)
-	GL_STUB(VertexAttribs1fvNV, 754, VertexAttribs1fvNV@12)
-	GL_STUB(VertexAttribs1svNV, 755, VertexAttribs1svNV@12)
-	GL_STUB(VertexAttribs2dvNV, 756, VertexAttribs2dvNV@12)
-	GL_STUB(VertexAttribs2fvNV, 757, VertexAttribs2fvNV@12)
-	GL_STUB(VertexAttribs2svNV, 758, VertexAttribs2svNV@12)
-	GL_STUB(VertexAttribs3dvNV, 759, VertexAttribs3dvNV@12)
-	GL_STUB(VertexAttribs3fvNV, 760, VertexAttribs3fvNV@12)
-	GL_STUB(VertexAttribs3svNV, 761, VertexAttribs3svNV@12)
-	GL_STUB(VertexAttribs4dvNV, 762, VertexAttribs4dvNV@12)
-	GL_STUB(VertexAttribs4fvNV, 763, VertexAttribs4fvNV@12)
-	GL_STUB(VertexAttribs4svNV, 764, VertexAttribs4svNV@12)
-	GL_STUB(VertexAttribs4ubvNV, 765, VertexAttribs4ubvNV@12)
-	GL_STUB(GetTexBumpParameterfvATI, 766, GetTexBumpParameterfvATI@8)
-	GL_STUB(GetTexBumpParameterivATI, 767, GetTexBumpParameterivATI@8)
-	GL_STUB(TexBumpParameterfvATI, 768, TexBumpParameterfvATI@8)
-	GL_STUB(TexBumpParameterivATI, 769, TexBumpParameterivATI@8)
-	GL_STUB(AlphaFragmentOp1ATI, 770, AlphaFragmentOp1ATI@24)
-	GL_STUB(AlphaFragmentOp2ATI, 771, AlphaFragmentOp2ATI@36)
-	GL_STUB(AlphaFragmentOp3ATI, 772, AlphaFragmentOp3ATI@48)
-	GL_STUB(BeginFragmentShaderATI, 773, BeginFragmentShaderATI@0)
-	GL_STUB(BindFragmentShaderATI, 774, BindFragmentShaderATI@4)
-	GL_STUB(ColorFragmentOp1ATI, 775, ColorFragmentOp1ATI@28)
-	GL_STUB(ColorFragmentOp2ATI, 776, ColorFragmentOp2ATI@40)
-	GL_STUB(ColorFragmentOp3ATI, 777, ColorFragmentOp3ATI@52)
-	GL_STUB(DeleteFragmentShaderATI, 778, DeleteFragmentShaderATI@4)
-	GL_STUB(EndFragmentShaderATI, 779, EndFragmentShaderATI@0)
-	GL_STUB(GenFragmentShadersATI, 780, GenFragmentShadersATI@4)
-	GL_STUB(PassTexCoordATI, 781, PassTexCoordATI@12)
-	GL_STUB(SampleMapATI, 782, SampleMapATI@12)
-	GL_STUB(SetFragmentShaderConstantATI, 783, SetFragmentShaderConstantATI@8)
-	GL_STUB(PointParameteriNV, 784, PointParameteriNV@8)
-	GL_STUB(PointParameterivNV, 785, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@4))
-	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@4))
-	GL_STUB(_dispatch_stub_788, 788, _dispatch_stub_788@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@8))
-	GL_STUB(_dispatch_stub_789, 789, _dispatch_stub_789@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@8))
-	GL_STUB(_dispatch_stub_790, 790, _dispatch_stub_790@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@4))
-	GL_STUB(GetProgramNamedParameterdvNV, 791, GetProgramNamedParameterdvNV@16)
-	GL_STUB(GetProgramNamedParameterfvNV, 792, GetProgramNamedParameterfvNV@16)
-	GL_STUB(ProgramNamedParameter4dNV, 793, ProgramNamedParameter4dNV@44)
-	GL_STUB(ProgramNamedParameter4dvNV, 794, ProgramNamedParameter4dvNV@16)
-	GL_STUB(ProgramNamedParameter4fNV, 795, ProgramNamedParameter4fNV@28)
-	GL_STUB(ProgramNamedParameter4fvNV, 796, ProgramNamedParameter4fvNV@16)
-	GL_STUB(PrimitiveRestartIndexNV, 797, PrimitiveRestartIndexNV@4)
-	GL_STUB(PrimitiveRestartNV, 798, PrimitiveRestartNV@0)
-	GL_STUB(_dispatch_stub_799, 799, _dispatch_stub_799@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_799, _dispatch_stub_799@16))
-	GL_STUB(_dispatch_stub_800, 800, _dispatch_stub_800@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_800, _dispatch_stub_800@8))
-	GL_STUB(BindFramebufferEXT, 801, BindFramebufferEXT@8)
-	GL_STUB(BindRenderbufferEXT, 802, BindRenderbufferEXT@8)
-	GL_STUB(CheckFramebufferStatusEXT, 803, CheckFramebufferStatusEXT@4)
-	GL_STUB(DeleteFramebuffersEXT, 804, DeleteFramebuffersEXT@8)
-	GL_STUB(DeleteRenderbuffersEXT, 805, DeleteRenderbuffersEXT@8)
-	GL_STUB(FramebufferRenderbufferEXT, 806, FramebufferRenderbufferEXT@16)
-	GL_STUB(FramebufferTexture1DEXT, 807, FramebufferTexture1DEXT@20)
-	GL_STUB(FramebufferTexture2DEXT, 808, FramebufferTexture2DEXT@20)
-	GL_STUB(FramebufferTexture3DEXT, 809, FramebufferTexture3DEXT@24)
-	GL_STUB(GenFramebuffersEXT, 810, GenFramebuffersEXT@8)
-	GL_STUB(GenRenderbuffersEXT, 811, GenRenderbuffersEXT@8)
-	GL_STUB(GenerateMipmapEXT, 812, GenerateMipmapEXT@4)
-	GL_STUB(GetFramebufferAttachmentParameterivEXT, 813, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB(GetRenderbufferParameterivEXT, 814, GetRenderbufferParameterivEXT@12)
-	GL_STUB(IsFramebufferEXT, 815, IsFramebufferEXT@4)
-	GL_STUB(IsRenderbufferEXT, 816, IsRenderbufferEXT@4)
-	GL_STUB(RenderbufferStorageEXT, 817, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_818, 818, _dispatch_stub_818@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_818, _dispatch_stub_818@40))
-	GL_STUB(_dispatch_stub_819, 819, _dispatch_stub_819@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_819, _dispatch_stub_819@12))
-	GL_STUB(_dispatch_stub_820, 820, _dispatch_stub_820@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_820, _dispatch_stub_820@12))
-	GL_STUB(BindFragDataLocationEXT, 821, BindFragDataLocationEXT@12)
-	GL_STUB(GetFragDataLocationEXT, 822, GetFragDataLocationEXT@8)
-	GL_STUB(GetUniformuivEXT, 823, GetUniformuivEXT@12)
-	GL_STUB(GetVertexAttribIivEXT, 824, GetVertexAttribIivEXT@12)
-	GL_STUB(GetVertexAttribIuivEXT, 825, GetVertexAttribIuivEXT@12)
-	GL_STUB(Uniform1uiEXT, 826, Uniform1uiEXT@8)
-	GL_STUB(Uniform1uivEXT, 827, Uniform1uivEXT@12)
-	GL_STUB(Uniform2uiEXT, 828, Uniform2uiEXT@12)
-	GL_STUB(Uniform2uivEXT, 829, Uniform2uivEXT@12)
-	GL_STUB(Uniform3uiEXT, 830, Uniform3uiEXT@16)
-	GL_STUB(Uniform3uivEXT, 831, Uniform3uivEXT@12)
-	GL_STUB(Uniform4uiEXT, 832, Uniform4uiEXT@20)
-	GL_STUB(Uniform4uivEXT, 833, Uniform4uivEXT@12)
-	GL_STUB(VertexAttribI1iEXT, 834, VertexAttribI1iEXT@8)
-	GL_STUB(VertexAttribI1ivEXT, 835, VertexAttribI1ivEXT@8)
-	GL_STUB(VertexAttribI1uiEXT, 836, VertexAttribI1uiEXT@8)
-	GL_STUB(VertexAttribI1uivEXT, 837, VertexAttribI1uivEXT@8)
-	GL_STUB(VertexAttribI2iEXT, 838, VertexAttribI2iEXT@12)
-	GL_STUB(VertexAttribI2ivEXT, 839, VertexAttribI2ivEXT@8)
-	GL_STUB(VertexAttribI2uiEXT, 840, VertexAttribI2uiEXT@12)
-	GL_STUB(VertexAttribI2uivEXT, 841, VertexAttribI2uivEXT@8)
-	GL_STUB(VertexAttribI3iEXT, 842, VertexAttribI3iEXT@16)
-	GL_STUB(VertexAttribI3ivEXT, 843, VertexAttribI3ivEXT@8)
-	GL_STUB(VertexAttribI3uiEXT, 844, VertexAttribI3uiEXT@16)
-	GL_STUB(VertexAttribI3uivEXT, 845, VertexAttribI3uivEXT@8)
-	GL_STUB(VertexAttribI4bvEXT, 846, VertexAttribI4bvEXT@8)
-	GL_STUB(VertexAttribI4iEXT, 847, VertexAttribI4iEXT@20)
-	GL_STUB(VertexAttribI4ivEXT, 848, VertexAttribI4ivEXT@8)
-	GL_STUB(VertexAttribI4svEXT, 849, VertexAttribI4svEXT@8)
-	GL_STUB(VertexAttribI4ubvEXT, 850, VertexAttribI4ubvEXT@8)
-	GL_STUB(VertexAttribI4uiEXT, 851, VertexAttribI4uiEXT@20)
-	GL_STUB(VertexAttribI4uivEXT, 852, VertexAttribI4uivEXT@8)
-	GL_STUB(VertexAttribI4usvEXT, 853, VertexAttribI4usvEXT@8)
-	GL_STUB(VertexAttribIPointerEXT, 854, VertexAttribIPointerEXT@20)
-	GL_STUB(FramebufferTextureLayerEXT, 855, FramebufferTextureLayerEXT@20)
-	GL_STUB(ColorMaskIndexedEXT, 856, ColorMaskIndexedEXT@20)
-	GL_STUB(DisableIndexedEXT, 857, DisableIndexedEXT@8)
-	GL_STUB(EnableIndexedEXT, 858, EnableIndexedEXT@8)
-	GL_STUB(GetBooleanIndexedvEXT, 859, GetBooleanIndexedvEXT@12)
-	GL_STUB(GetIntegerIndexedvEXT, 860, GetIntegerIndexedvEXT@12)
-	GL_STUB(IsEnabledIndexedEXT, 861, IsEnabledIndexedEXT@8)
-	GL_STUB(ClearColorIiEXT, 862, ClearColorIiEXT@16)
-	GL_STUB(ClearColorIuiEXT, 863, ClearColorIuiEXT@16)
-	GL_STUB(GetTexParameterIivEXT, 864, GetTexParameterIivEXT@12)
-	GL_STUB(GetTexParameterIuivEXT, 865, GetTexParameterIuivEXT@12)
-	GL_STUB(TexParameterIivEXT, 866, TexParameterIivEXT@12)
-	GL_STUB(TexParameterIuivEXT, 867, TexParameterIuivEXT@12)
-	GL_STUB(BeginConditionalRenderNV, 868, BeginConditionalRenderNV@8)
-	GL_STUB(EndConditionalRenderNV, 869, EndConditionalRenderNV@0)
-	GL_STUB(BeginTransformFeedbackEXT, 870, BeginTransformFeedbackEXT@4)
-	GL_STUB(BindBufferBaseEXT, 871, BindBufferBaseEXT@12)
-	GL_STUB(BindBufferOffsetEXT, 872, BindBufferOffsetEXT@16)
-	GL_STUB(BindBufferRangeEXT, 873, BindBufferRangeEXT@20)
-	GL_STUB(EndTransformFeedbackEXT, 874, EndTransformFeedbackEXT@0)
-	GL_STUB(GetTransformFeedbackVaryingEXT, 875, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB(TransformFeedbackVaryingsEXT, 876, TransformFeedbackVaryingsEXT@16)
-	GL_STUB(ProvokingVertexEXT, 877, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_878, 878, _dispatch_stub_878@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_878, _dispatch_stub_878@12))
-	GL_STUB(_dispatch_stub_879, 879, _dispatch_stub_879@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_879, _dispatch_stub_879@12))
-	GL_STUB(GetObjectParameterivAPPLE, 880, GetObjectParameterivAPPLE@16)
-	GL_STUB(ObjectPurgeableAPPLE, 881, ObjectPurgeableAPPLE@12)
-	GL_STUB(ObjectUnpurgeableAPPLE, 882, ObjectUnpurgeableAPPLE@12)
-	GL_STUB(ActiveProgramEXT, 883, ActiveProgramEXT@4)
-	GL_STUB(CreateShaderProgramEXT, 884, CreateShaderProgramEXT@8)
-	GL_STUB(UseShaderProgramEXT, 885, UseShaderProgramEXT@8)
-	GL_STUB(TextureBarrierNV, 886, TextureBarrierNV@0)
-	GL_STUB(_dispatch_stub_887, 887, _dispatch_stub_887@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_887, _dispatch_stub_887@16))
-	GL_STUB(_dispatch_stub_888, 888, _dispatch_stub_888@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_888, _dispatch_stub_888@16))
-	GL_STUB(_dispatch_stub_889, 889, _dispatch_stub_889@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_889, _dispatch_stub_889@16))
-	GL_STUB(_dispatch_stub_890, 890, _dispatch_stub_890@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_890, _dispatch_stub_890@12))
-	GL_STUB(_dispatch_stub_891, 891, _dispatch_stub_891@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_891, _dispatch_stub_891@12))
-	GL_STUB(EGLImageTargetRenderbufferStorageOES, 892, EGLImageTargetRenderbufferStorageOES@8)
-	GL_STUB(EGLImageTargetTexture2DOES, 893, EGLImageTargetTexture2DOES@8)
+	GL_STUB(BindSampler, 600, BindSampler@8)
+	GL_STUB(DeleteSamplers, 601, DeleteSamplers@8)
+	GL_STUB(GenSamplers, 602, GenSamplers@8)
+	GL_STUB(GetSamplerParameterIiv, 603, GetSamplerParameterIiv@12)
+	GL_STUB(GetSamplerParameterIuiv, 604, GetSamplerParameterIuiv@12)
+	GL_STUB(GetSamplerParameterfv, 605, GetSamplerParameterfv@12)
+	GL_STUB(GetSamplerParameteriv, 606, GetSamplerParameteriv@12)
+	GL_STUB(IsSampler, 607, IsSampler@4)
+	GL_STUB(SamplerParameterIiv, 608, SamplerParameterIiv@12)
+	GL_STUB(SamplerParameterIuiv, 609, SamplerParameterIuiv@12)
+	GL_STUB(SamplerParameterf, 610, SamplerParameterf@12)
+	GL_STUB(SamplerParameterfv, 611, SamplerParameterfv@12)
+	GL_STUB(SamplerParameteri, 612, SamplerParameteri@12)
+	GL_STUB(SamplerParameteriv, 613, SamplerParameteriv@12)
+	GL_STUB(BindTransformFeedback, 614, BindTransformFeedback@8)
+	GL_STUB(DeleteTransformFeedbacks, 615, DeleteTransformFeedbacks@8)
+	GL_STUB(DrawTransformFeedback, 616, DrawTransformFeedback@8)
+	GL_STUB(GenTransformFeedbacks, 617, GenTransformFeedbacks@8)
+	GL_STUB(IsTransformFeedback, 618, IsTransformFeedback@4)
+	GL_STUB(PauseTransformFeedback, 619, PauseTransformFeedback@0)
+	GL_STUB(ResumeTransformFeedback, 620, ResumeTransformFeedback@0)
+	GL_STUB(ClearDepthf, 621, ClearDepthf@4)
+	GL_STUB(DepthRangef, 622, DepthRangef@8)
+	GL_STUB(GetShaderPrecisionFormat, 623, GetShaderPrecisionFormat@16)
+	GL_STUB(ReleaseShaderCompiler, 624, ReleaseShaderCompiler@0)
+	GL_STUB(ShaderBinary, 625, ShaderBinary@20)
+	GL_STUB(PolygonOffsetEXT, 626, PolygonOffsetEXT@8)
+	GL_STUB(_dispatch_stub_627, 627, _dispatch_stub_627@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_627, _dispatch_stub_627@8))
+	GL_STUB(_dispatch_stub_628, 628, _dispatch_stub_628@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_628, _dispatch_stub_628@8))
+	GL_STUB(_dispatch_stub_629, 629, _dispatch_stub_629@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_629, _dispatch_stub_629@8))
+	GL_STUB(_dispatch_stub_630, 630, _dispatch_stub_630@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_630, _dispatch_stub_630@8))
+	GL_STUB(_dispatch_stub_631, 631, _dispatch_stub_631@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_631, _dispatch_stub_631@8))
+	GL_STUB(_dispatch_stub_632, 632, _dispatch_stub_632@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_632, _dispatch_stub_632@8))
+	GL_STUB(_dispatch_stub_633, 633, _dispatch_stub_633@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_633, _dispatch_stub_633@8))
+	GL_STUB(_dispatch_stub_634, 634, _dispatch_stub_634@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_634, _dispatch_stub_634@4))
+	GL_STUB(ColorPointerEXT, 635, ColorPointerEXT@20)
+	GL_STUB(EdgeFlagPointerEXT, 636, EdgeFlagPointerEXT@12)
+	GL_STUB(IndexPointerEXT, 637, IndexPointerEXT@16)
+	GL_STUB(NormalPointerEXT, 638, NormalPointerEXT@16)
+	GL_STUB(TexCoordPointerEXT, 639, TexCoordPointerEXT@20)
+	GL_STUB(VertexPointerEXT, 640, VertexPointerEXT@20)
+	GL_STUB(PointParameterfEXT, 641, PointParameterfEXT@8)
+	GL_STUB(PointParameterfvEXT, 642, PointParameterfvEXT@8)
+	GL_STUB(LockArraysEXT, 643, LockArraysEXT@8)
+	GL_STUB(UnlockArraysEXT, 644, UnlockArraysEXT@0)
+	GL_STUB(SecondaryColor3bEXT, 645, SecondaryColor3bEXT@12)
+	GL_STUB(SecondaryColor3bvEXT, 646, SecondaryColor3bvEXT@4)
+	GL_STUB(SecondaryColor3dEXT, 647, SecondaryColor3dEXT@24)
+	GL_STUB(SecondaryColor3dvEXT, 648, SecondaryColor3dvEXT@4)
+	GL_STUB(SecondaryColor3fEXT, 649, SecondaryColor3fEXT@12)
+	GL_STUB(SecondaryColor3fvEXT, 650, SecondaryColor3fvEXT@4)
+	GL_STUB(SecondaryColor3iEXT, 651, SecondaryColor3iEXT@12)
+	GL_STUB(SecondaryColor3ivEXT, 652, SecondaryColor3ivEXT@4)
+	GL_STUB(SecondaryColor3sEXT, 653, SecondaryColor3sEXT@12)
+	GL_STUB(SecondaryColor3svEXT, 654, SecondaryColor3svEXT@4)
+	GL_STUB(SecondaryColor3ubEXT, 655, SecondaryColor3ubEXT@12)
+	GL_STUB(SecondaryColor3ubvEXT, 656, SecondaryColor3ubvEXT@4)
+	GL_STUB(SecondaryColor3uiEXT, 657, SecondaryColor3uiEXT@12)
+	GL_STUB(SecondaryColor3uivEXT, 658, SecondaryColor3uivEXT@4)
+	GL_STUB(SecondaryColor3usEXT, 659, SecondaryColor3usEXT@12)
+	GL_STUB(SecondaryColor3usvEXT, 660, SecondaryColor3usvEXT@4)
+	GL_STUB(SecondaryColorPointerEXT, 661, SecondaryColorPointerEXT@16)
+	GL_STUB(MultiDrawArraysEXT, 662, MultiDrawArraysEXT@16)
+	GL_STUB(MultiDrawElementsEXT, 663, MultiDrawElementsEXT@20)
+	GL_STUB(FogCoordPointerEXT, 664, FogCoordPointerEXT@12)
+	GL_STUB(FogCoorddEXT, 665, FogCoorddEXT@8)
+	GL_STUB(FogCoorddvEXT, 666, FogCoorddvEXT@4)
+	GL_STUB(FogCoordfEXT, 667, FogCoordfEXT@4)
+	GL_STUB(FogCoordfvEXT, 668, FogCoordfvEXT@4)
+	GL_STUB(_dispatch_stub_669, 669, _dispatch_stub_669@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_669, _dispatch_stub_669@4))
+	GL_STUB(BlendFuncSeparateEXT, 670, BlendFuncSeparateEXT@16)
+	GL_STUB(FlushVertexArrayRangeNV, 671, FlushVertexArrayRangeNV@0)
+	GL_STUB(VertexArrayRangeNV, 672, VertexArrayRangeNV@8)
+	GL_STUB(CombinerInputNV, 673, CombinerInputNV@24)
+	GL_STUB(CombinerOutputNV, 674, CombinerOutputNV@40)
+	GL_STUB(CombinerParameterfNV, 675, CombinerParameterfNV@8)
+	GL_STUB(CombinerParameterfvNV, 676, CombinerParameterfvNV@8)
+	GL_STUB(CombinerParameteriNV, 677, CombinerParameteriNV@8)
+	GL_STUB(CombinerParameterivNV, 678, CombinerParameterivNV@8)
+	GL_STUB(FinalCombinerInputNV, 679, FinalCombinerInputNV@16)
+	GL_STUB(GetCombinerInputParameterfvNV, 680, GetCombinerInputParameterfvNV@20)
+	GL_STUB(GetCombinerInputParameterivNV, 681, GetCombinerInputParameterivNV@20)
+	GL_STUB(GetCombinerOutputParameterfvNV, 682, GetCombinerOutputParameterfvNV@16)
+	GL_STUB(GetCombinerOutputParameterivNV, 683, GetCombinerOutputParameterivNV@16)
+	GL_STUB(GetFinalCombinerInputParameterfvNV, 684, GetFinalCombinerInputParameterfvNV@12)
+	GL_STUB(GetFinalCombinerInputParameterivNV, 685, GetFinalCombinerInputParameterivNV@12)
+	GL_STUB(ResizeBuffersMESA, 686, ResizeBuffersMESA@0)
+	GL_STUB(WindowPos2dMESA, 687, WindowPos2dMESA@16)
+	GL_STUB(WindowPos2dvMESA, 688, WindowPos2dvMESA@4)
+	GL_STUB(WindowPos2fMESA, 689, WindowPos2fMESA@8)
+	GL_STUB(WindowPos2fvMESA, 690, WindowPos2fvMESA@4)
+	GL_STUB(WindowPos2iMESA, 691, WindowPos2iMESA@8)
+	GL_STUB(WindowPos2ivMESA, 692, WindowPos2ivMESA@4)
+	GL_STUB(WindowPos2sMESA, 693, WindowPos2sMESA@8)
+	GL_STUB(WindowPos2svMESA, 694, WindowPos2svMESA@4)
+	GL_STUB(WindowPos3dMESA, 695, WindowPos3dMESA@24)
+	GL_STUB(WindowPos3dvMESA, 696, WindowPos3dvMESA@4)
+	GL_STUB(WindowPos3fMESA, 697, WindowPos3fMESA@12)
+	GL_STUB(WindowPos3fvMESA, 698, WindowPos3fvMESA@4)
+	GL_STUB(WindowPos3iMESA, 699, WindowPos3iMESA@12)
+	GL_STUB(WindowPos3ivMESA, 700, WindowPos3ivMESA@4)
+	GL_STUB(WindowPos3sMESA, 701, WindowPos3sMESA@12)
+	GL_STUB(WindowPos3svMESA, 702, WindowPos3svMESA@4)
+	GL_STUB(WindowPos4dMESA, 703, WindowPos4dMESA@32)
+	GL_STUB(WindowPos4dvMESA, 704, WindowPos4dvMESA@4)
+	GL_STUB(WindowPos4fMESA, 705, WindowPos4fMESA@16)
+	GL_STUB(WindowPos4fvMESA, 706, WindowPos4fvMESA@4)
+	GL_STUB(WindowPos4iMESA, 707, WindowPos4iMESA@16)
+	GL_STUB(WindowPos4ivMESA, 708, WindowPos4ivMESA@4)
+	GL_STUB(WindowPos4sMESA, 709, WindowPos4sMESA@16)
+	GL_STUB(WindowPos4svMESA, 710, WindowPos4svMESA@4)
+	GL_STUB(_dispatch_stub_711, 711, _dispatch_stub_711@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_711, _dispatch_stub_711@20))
+	GL_STUB(_dispatch_stub_712, 712, _dispatch_stub_712@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_712, _dispatch_stub_712@24))
+	GL_STUB(_dispatch_stub_713, 713, _dispatch_stub_713@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_713, _dispatch_stub_713@8))
+	GL_STUB(_dispatch_stub_714, 714, _dispatch_stub_714@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_714, _dispatch_stub_714@4))
+	GL_STUB(_dispatch_stub_715, 715, _dispatch_stub_715@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_715, _dispatch_stub_715@8))
+	GL_STUB(_dispatch_stub_716, 716, _dispatch_stub_716@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_716, _dispatch_stub_716@12))
+	GL_STUB(_dispatch_stub_717, 717, _dispatch_stub_717@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_717, _dispatch_stub_717@4))
+	GL_STUB(_dispatch_stub_718, 718, _dispatch_stub_718@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_718, _dispatch_stub_718@8))
+	GL_STUB(_dispatch_stub_719, 719, _dispatch_stub_719@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_719, _dispatch_stub_719@4))
+	GL_STUB(AreProgramsResidentNV, 720, AreProgramsResidentNV@12)
+	GL_STUB(BindProgramNV, 721, BindProgramNV@8)
+	GL_STUB(DeleteProgramsNV, 722, DeleteProgramsNV@8)
+	GL_STUB(ExecuteProgramNV, 723, ExecuteProgramNV@12)
+	GL_STUB(GenProgramsNV, 724, GenProgramsNV@8)
+	GL_STUB(GetProgramParameterdvNV, 725, GetProgramParameterdvNV@16)
+	GL_STUB(GetProgramParameterfvNV, 726, GetProgramParameterfvNV@16)
+	GL_STUB(GetProgramStringNV, 727, GetProgramStringNV@12)
+	GL_STUB(GetProgramivNV, 728, GetProgramivNV@12)
+	GL_STUB(GetTrackMatrixivNV, 729, GetTrackMatrixivNV@16)
+	GL_STUB(GetVertexAttribPointervNV, 730, GetVertexAttribPointervNV@12)
+	GL_STUB(GetVertexAttribdvNV, 731, GetVertexAttribdvNV@12)
+	GL_STUB(GetVertexAttribfvNV, 732, GetVertexAttribfvNV@12)
+	GL_STUB(GetVertexAttribivNV, 733, GetVertexAttribivNV@12)
+	GL_STUB(IsProgramNV, 734, IsProgramNV@4)
+	GL_STUB(LoadProgramNV, 735, LoadProgramNV@16)
+	GL_STUB(ProgramParameters4dvNV, 736, ProgramParameters4dvNV@16)
+	GL_STUB(ProgramParameters4fvNV, 737, ProgramParameters4fvNV@16)
+	GL_STUB(RequestResidentProgramsNV, 738, RequestResidentProgramsNV@8)
+	GL_STUB(TrackMatrixNV, 739, TrackMatrixNV@16)
+	GL_STUB(VertexAttrib1dNV, 740, VertexAttrib1dNV@12)
+	GL_STUB(VertexAttrib1dvNV, 741, VertexAttrib1dvNV@8)
+	GL_STUB(VertexAttrib1fNV, 742, VertexAttrib1fNV@8)
+	GL_STUB(VertexAttrib1fvNV, 743, VertexAttrib1fvNV@8)
+	GL_STUB(VertexAttrib1sNV, 744, VertexAttrib1sNV@8)
+	GL_STUB(VertexAttrib1svNV, 745, VertexAttrib1svNV@8)
+	GL_STUB(VertexAttrib2dNV, 746, VertexAttrib2dNV@20)
+	GL_STUB(VertexAttrib2dvNV, 747, VertexAttrib2dvNV@8)
+	GL_STUB(VertexAttrib2fNV, 748, VertexAttrib2fNV@12)
+	GL_STUB(VertexAttrib2fvNV, 749, VertexAttrib2fvNV@8)
+	GL_STUB(VertexAttrib2sNV, 750, VertexAttrib2sNV@12)
+	GL_STUB(VertexAttrib2svNV, 751, VertexAttrib2svNV@8)
+	GL_STUB(VertexAttrib3dNV, 752, VertexAttrib3dNV@28)
+	GL_STUB(VertexAttrib3dvNV, 753, VertexAttrib3dvNV@8)
+	GL_STUB(VertexAttrib3fNV, 754, VertexAttrib3fNV@16)
+	GL_STUB(VertexAttrib3fvNV, 755, VertexAttrib3fvNV@8)
+	GL_STUB(VertexAttrib3sNV, 756, VertexAttrib3sNV@16)
+	GL_STUB(VertexAttrib3svNV, 757, VertexAttrib3svNV@8)
+	GL_STUB(VertexAttrib4dNV, 758, VertexAttrib4dNV@36)
+	GL_STUB(VertexAttrib4dvNV, 759, VertexAttrib4dvNV@8)
+	GL_STUB(VertexAttrib4fNV, 760, VertexAttrib4fNV@20)
+	GL_STUB(VertexAttrib4fvNV, 761, VertexAttrib4fvNV@8)
+	GL_STUB(VertexAttrib4sNV, 762, VertexAttrib4sNV@20)
+	GL_STUB(VertexAttrib4svNV, 763, VertexAttrib4svNV@8)
+	GL_STUB(VertexAttrib4ubNV, 764, VertexAttrib4ubNV@20)
+	GL_STUB(VertexAttrib4ubvNV, 765, VertexAttrib4ubvNV@8)
+	GL_STUB(VertexAttribPointerNV, 766, VertexAttribPointerNV@20)
+	GL_STUB(VertexAttribs1dvNV, 767, VertexAttribs1dvNV@12)
+	GL_STUB(VertexAttribs1fvNV, 768, VertexAttribs1fvNV@12)
+	GL_STUB(VertexAttribs1svNV, 769, VertexAttribs1svNV@12)
+	GL_STUB(VertexAttribs2dvNV, 770, VertexAttribs2dvNV@12)
+	GL_STUB(VertexAttribs2fvNV, 771, VertexAttribs2fvNV@12)
+	GL_STUB(VertexAttribs2svNV, 772, VertexAttribs2svNV@12)
+	GL_STUB(VertexAttribs3dvNV, 773, VertexAttribs3dvNV@12)
+	GL_STUB(VertexAttribs3fvNV, 774, VertexAttribs3fvNV@12)
+	GL_STUB(VertexAttribs3svNV, 775, VertexAttribs3svNV@12)
+	GL_STUB(VertexAttribs4dvNV, 776, VertexAttribs4dvNV@12)
+	GL_STUB(VertexAttribs4fvNV, 777, VertexAttribs4fvNV@12)
+	GL_STUB(VertexAttribs4svNV, 778, VertexAttribs4svNV@12)
+	GL_STUB(VertexAttribs4ubvNV, 779, VertexAttribs4ubvNV@12)
+	GL_STUB(GetTexBumpParameterfvATI, 780, GetTexBumpParameterfvATI@8)
+	GL_STUB(GetTexBumpParameterivATI, 781, GetTexBumpParameterivATI@8)
+	GL_STUB(TexBumpParameterfvATI, 782, TexBumpParameterfvATI@8)
+	GL_STUB(TexBumpParameterivATI, 783, TexBumpParameterivATI@8)
+	GL_STUB(AlphaFragmentOp1ATI, 784, AlphaFragmentOp1ATI@24)
+	GL_STUB(AlphaFragmentOp2ATI, 785, AlphaFragmentOp2ATI@36)
+	GL_STUB(AlphaFragmentOp3ATI, 786, AlphaFragmentOp3ATI@48)
+	GL_STUB(BeginFragmentShaderATI, 787, BeginFragmentShaderATI@0)
+	GL_STUB(BindFragmentShaderATI, 788, BindFragmentShaderATI@4)
+	GL_STUB(ColorFragmentOp1ATI, 789, ColorFragmentOp1ATI@28)
+	GL_STUB(ColorFragmentOp2ATI, 790, ColorFragmentOp2ATI@40)
+	GL_STUB(ColorFragmentOp3ATI, 791, ColorFragmentOp3ATI@52)
+	GL_STUB(DeleteFragmentShaderATI, 792, DeleteFragmentShaderATI@4)
+	GL_STUB(EndFragmentShaderATI, 793, EndFragmentShaderATI@0)
+	GL_STUB(GenFragmentShadersATI, 794, GenFragmentShadersATI@4)
+	GL_STUB(PassTexCoordATI, 795, PassTexCoordATI@12)
+	GL_STUB(SampleMapATI, 796, SampleMapATI@12)
+	GL_STUB(SetFragmentShaderConstantATI, 797, SetFragmentShaderConstantATI@8)
+	GL_STUB(PointParameteriNV, 798, PointParameteriNV@8)
+	GL_STUB(PointParameterivNV, 799, PointParameterivNV@8)
+	GL_STUB(_dispatch_stub_800, 800, _dispatch_stub_800@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_800, _dispatch_stub_800@4))
+	GL_STUB(_dispatch_stub_801, 801, _dispatch_stub_801@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_801, _dispatch_stub_801@4))
+	GL_STUB(_dispatch_stub_802, 802, _dispatch_stub_802@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_802, _dispatch_stub_802@8))
+	GL_STUB(_dispatch_stub_803, 803, _dispatch_stub_803@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_803, _dispatch_stub_803@8))
+	GL_STUB(_dispatch_stub_804, 804, _dispatch_stub_804@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_804, _dispatch_stub_804@4))
+	GL_STUB(GetProgramNamedParameterdvNV, 805, GetProgramNamedParameterdvNV@16)
+	GL_STUB(GetProgramNamedParameterfvNV, 806, GetProgramNamedParameterfvNV@16)
+	GL_STUB(ProgramNamedParameter4dNV, 807, ProgramNamedParameter4dNV@44)
+	GL_STUB(ProgramNamedParameter4dvNV, 808, ProgramNamedParameter4dvNV@16)
+	GL_STUB(ProgramNamedParameter4fNV, 809, ProgramNamedParameter4fNV@28)
+	GL_STUB(ProgramNamedParameter4fvNV, 810, ProgramNamedParameter4fvNV@16)
+	GL_STUB(PrimitiveRestartIndexNV, 811, PrimitiveRestartIndexNV@4)
+	GL_STUB(PrimitiveRestartNV, 812, PrimitiveRestartNV@0)
+	GL_STUB(_dispatch_stub_813, 813, _dispatch_stub_813@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_813, _dispatch_stub_813@16))
+	GL_STUB(_dispatch_stub_814, 814, _dispatch_stub_814@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_814, _dispatch_stub_814@8))
+	GL_STUB(BindFramebufferEXT, 815, BindFramebufferEXT@8)
+	GL_STUB(BindRenderbufferEXT, 816, BindRenderbufferEXT@8)
+	GL_STUB(CheckFramebufferStatusEXT, 817, CheckFramebufferStatusEXT@4)
+	GL_STUB(DeleteFramebuffersEXT, 818, DeleteFramebuffersEXT@8)
+	GL_STUB(DeleteRenderbuffersEXT, 819, DeleteRenderbuffersEXT@8)
+	GL_STUB(FramebufferRenderbufferEXT, 820, FramebufferRenderbufferEXT@16)
+	GL_STUB(FramebufferTexture1DEXT, 821, FramebufferTexture1DEXT@20)
+	GL_STUB(FramebufferTexture2DEXT, 822, FramebufferTexture2DEXT@20)
+	GL_STUB(FramebufferTexture3DEXT, 823, FramebufferTexture3DEXT@24)
+	GL_STUB(GenFramebuffersEXT, 824, GenFramebuffersEXT@8)
+	GL_STUB(GenRenderbuffersEXT, 825, GenRenderbuffersEXT@8)
+	GL_STUB(GenerateMipmapEXT, 826, GenerateMipmapEXT@4)
+	GL_STUB(GetFramebufferAttachmentParameterivEXT, 827, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB(GetRenderbufferParameterivEXT, 828, GetRenderbufferParameterivEXT@12)
+	GL_STUB(IsFramebufferEXT, 829, IsFramebufferEXT@4)
+	GL_STUB(IsRenderbufferEXT, 830, IsRenderbufferEXT@4)
+	GL_STUB(RenderbufferStorageEXT, 831, RenderbufferStorageEXT@16)
+	GL_STUB(_dispatch_stub_832, 832, _dispatch_stub_832@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_832, _dispatch_stub_832@40))
+	GL_STUB(_dispatch_stub_833, 833, _dispatch_stub_833@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_833, _dispatch_stub_833@12))
+	GL_STUB(_dispatch_stub_834, 834, _dispatch_stub_834@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_834, _dispatch_stub_834@12))
+	GL_STUB(BindFragDataLocationEXT, 835, BindFragDataLocationEXT@12)
+	GL_STUB(GetFragDataLocationEXT, 836, GetFragDataLocationEXT@8)
+	GL_STUB(GetUniformuivEXT, 837, GetUniformuivEXT@12)
+	GL_STUB(GetVertexAttribIivEXT, 838, GetVertexAttribIivEXT@12)
+	GL_STUB(GetVertexAttribIuivEXT, 839, GetVertexAttribIuivEXT@12)
+	GL_STUB(Uniform1uiEXT, 840, Uniform1uiEXT@8)
+	GL_STUB(Uniform1uivEXT, 841, Uniform1uivEXT@12)
+	GL_STUB(Uniform2uiEXT, 842, Uniform2uiEXT@12)
+	GL_STUB(Uniform2uivEXT, 843, Uniform2uivEXT@12)
+	GL_STUB(Uniform3uiEXT, 844, Uniform3uiEXT@16)
+	GL_STUB(Uniform3uivEXT, 845, Uniform3uivEXT@12)
+	GL_STUB(Uniform4uiEXT, 846, Uniform4uiEXT@20)
+	GL_STUB(Uniform4uivEXT, 847, Uniform4uivEXT@12)
+	GL_STUB(VertexAttribI1iEXT, 848, VertexAttribI1iEXT@8)
+	GL_STUB(VertexAttribI1ivEXT, 849, VertexAttribI1ivEXT@8)
+	GL_STUB(VertexAttribI1uiEXT, 850, VertexAttribI1uiEXT@8)
+	GL_STUB(VertexAttribI1uivEXT, 851, VertexAttribI1uivEXT@8)
+	GL_STUB(VertexAttribI2iEXT, 852, VertexAttribI2iEXT@12)
+	GL_STUB(VertexAttribI2ivEXT, 853, VertexAttribI2ivEXT@8)
+	GL_STUB(VertexAttribI2uiEXT, 854, VertexAttribI2uiEXT@12)
+	GL_STUB(VertexAttribI2uivEXT, 855, VertexAttribI2uivEXT@8)
+	GL_STUB(VertexAttribI3iEXT, 856, VertexAttribI3iEXT@16)
+	GL_STUB(VertexAttribI3ivEXT, 857, VertexAttribI3ivEXT@8)
+	GL_STUB(VertexAttribI3uiEXT, 858, VertexAttribI3uiEXT@16)
+	GL_STUB(VertexAttribI3uivEXT, 859, VertexAttribI3uivEXT@8)
+	GL_STUB(VertexAttribI4bvEXT, 860, VertexAttribI4bvEXT@8)
+	GL_STUB(VertexAttribI4iEXT, 861, VertexAttribI4iEXT@20)
+	GL_STUB(VertexAttribI4ivEXT, 862, VertexAttribI4ivEXT@8)
+	GL_STUB(VertexAttribI4svEXT, 863, VertexAttribI4svEXT@8)
+	GL_STUB(VertexAttribI4ubvEXT, 864, VertexAttribI4ubvEXT@8)
+	GL_STUB(VertexAttribI4uiEXT, 865, VertexAttribI4uiEXT@20)
+	GL_STUB(VertexAttribI4uivEXT, 866, VertexAttribI4uivEXT@8)
+	GL_STUB(VertexAttribI4usvEXT, 867, VertexAttribI4usvEXT@8)
+	GL_STUB(VertexAttribIPointerEXT, 868, VertexAttribIPointerEXT@20)
+	GL_STUB(FramebufferTextureLayerEXT, 869, FramebufferTextureLayerEXT@20)
+	GL_STUB(ColorMaskIndexedEXT, 870, ColorMaskIndexedEXT@20)
+	GL_STUB(DisableIndexedEXT, 871, DisableIndexedEXT@8)
+	GL_STUB(EnableIndexedEXT, 872, EnableIndexedEXT@8)
+	GL_STUB(GetBooleanIndexedvEXT, 873, GetBooleanIndexedvEXT@12)
+	GL_STUB(GetIntegerIndexedvEXT, 874, GetIntegerIndexedvEXT@12)
+	GL_STUB(IsEnabledIndexedEXT, 875, IsEnabledIndexedEXT@8)
+	GL_STUB(ClearColorIiEXT, 876, ClearColorIiEXT@16)
+	GL_STUB(ClearColorIuiEXT, 877, ClearColorIuiEXT@16)
+	GL_STUB(GetTexParameterIivEXT, 878, GetTexParameterIivEXT@12)
+	GL_STUB(GetTexParameterIuivEXT, 879, GetTexParameterIuivEXT@12)
+	GL_STUB(TexParameterIivEXT, 880, TexParameterIivEXT@12)
+	GL_STUB(TexParameterIuivEXT, 881, TexParameterIuivEXT@12)
+	GL_STUB(BeginConditionalRenderNV, 882, BeginConditionalRenderNV@8)
+	GL_STUB(EndConditionalRenderNV, 883, EndConditionalRenderNV@0)
+	GL_STUB(BeginTransformFeedbackEXT, 884, BeginTransformFeedbackEXT@4)
+	GL_STUB(BindBufferBaseEXT, 885, BindBufferBaseEXT@12)
+	GL_STUB(BindBufferOffsetEXT, 886, BindBufferOffsetEXT@16)
+	GL_STUB(BindBufferRangeEXT, 887, BindBufferRangeEXT@20)
+	GL_STUB(EndTransformFeedbackEXT, 888, EndTransformFeedbackEXT@0)
+	GL_STUB(GetTransformFeedbackVaryingEXT, 889, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB(TransformFeedbackVaryingsEXT, 890, TransformFeedbackVaryingsEXT@16)
+	GL_STUB(ProvokingVertexEXT, 891, ProvokingVertexEXT@4)
+	GL_STUB(_dispatch_stub_892, 892, _dispatch_stub_892@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_892, _dispatch_stub_892@12))
+	GL_STUB(_dispatch_stub_893, 893, _dispatch_stub_893@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_893, _dispatch_stub_893@12))
+	GL_STUB(GetObjectParameterivAPPLE, 894, GetObjectParameterivAPPLE@16)
+	GL_STUB(ObjectPurgeableAPPLE, 895, ObjectPurgeableAPPLE@12)
+	GL_STUB(ObjectUnpurgeableAPPLE, 896, ObjectUnpurgeableAPPLE@12)
+	GL_STUB(ActiveProgramEXT, 897, ActiveProgramEXT@4)
+	GL_STUB(CreateShaderProgramEXT, 898, CreateShaderProgramEXT@8)
+	GL_STUB(UseShaderProgramEXT, 899, UseShaderProgramEXT@8)
+	GL_STUB(TextureBarrierNV, 900, TextureBarrierNV@0)
+	GL_STUB(_dispatch_stub_901, 901, _dispatch_stub_901@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_901, _dispatch_stub_901@16))
+	GL_STUB(_dispatch_stub_902, 902, _dispatch_stub_902@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_902, _dispatch_stub_902@16))
+	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@16))
+	GL_STUB(_dispatch_stub_904, 904, _dispatch_stub_904@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_904, _dispatch_stub_904@12))
+	GL_STUB(_dispatch_stub_905, 905, _dispatch_stub_905@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_905, _dispatch_stub_905@12))
+	GL_STUB(EGLImageTargetRenderbufferStorageOES, 906, EGLImageTargetRenderbufferStorageOES@8)
+	GL_STUB(EGLImageTargetTexture2DOES, 907, EGLImageTargetTexture2DOES@8)
 	GL_STUB_ALIAS(ArrayElementEXT, 306, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, 307, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, 310, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1268,151 +1282,151 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(DrawElementsInstancedEXT, 574, DrawElementsInstancedEXT@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
 	GL_STUB_ALIAS(DrawElementsInstanced, 574, DrawElementsInstanced@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
 	GL_STUB_ALIAS(RenderbufferStorageMultisampleEXT, 575, RenderbufferStorageMultisampleEXT@20, RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
-	GL_STUB_ALIAS(PointParameterf, 627, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfARB, 627, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfv, 628, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(PointParameterfvARB, 628, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(SecondaryColor3b, 631, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3bv, 632, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3d, 633, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
-	GL_STUB_ALIAS(SecondaryColor3dv, 634, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3f, 635, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3fv, 636, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3i, 637, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3iv, 638, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3s, 639, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3sv, 640, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ub, 641, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3ubv, 642, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ui, 643, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3uiv, 644, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3us, 645, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3usv, 646, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
-	GL_STUB_ALIAS(SecondaryColorPointer, 647, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
-	GL_STUB_ALIAS(MultiDrawArrays, 648, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
-	GL_STUB_ALIAS(MultiDrawElements, 649, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
-	GL_STUB_ALIAS(FogCoordPointer, 650, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
-	GL_STUB_ALIAS(FogCoordd, 651, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
-	GL_STUB_ALIAS(FogCoorddv, 652, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
-	GL_STUB_ALIAS(FogCoordf, 653, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
-	GL_STUB_ALIAS(FogCoordfv, 654, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB_ALIAS(BlendFuncSeparate, 656, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
-	GL_STUB_ALIAS(WindowPos2d, 673, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dARB, 673, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dv, 674, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2dvARB, 674, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2f, 675, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fARB, 675, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fv, 676, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2fvARB, 676, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2i, 677, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iARB, 677, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iv, 678, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2ivARB, 678, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2s, 679, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sARB, 679, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sv, 680, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos2svARB, 680, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos3d, 681, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dARB, 681, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dv, 682, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3dvARB, 682, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3f, 683, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fARB, 683, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fv, 684, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3fvARB, 684, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3i, 685, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iARB, 685, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iv, 686, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3ivARB, 686, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3s, 687, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sARB, 687, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sv, 688, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(WindowPos3svARB, 688, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(BindProgramARB, 707, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
-	GL_STUB_ALIAS(DeleteProgramsARB, 708, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
-	GL_STUB_ALIAS(GenProgramsARB, 710, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
-	GL_STUB_ALIAS(GetVertexAttribPointerv, 716, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(GetVertexAttribPointervARB, 716, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(IsProgramARB, 720, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
-	GL_STUB_ALIAS(PointParameteri, 784, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
-	GL_STUB_ALIAS(PointParameteriv, 785, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
-	GL_STUB_ALIAS(DeleteVertexArrays, 788, DeleteVertexArrays@8, _dispatch_stub_788, _dispatch_stub_788@8)
-	GL_STUB_ALIAS(IsVertexArray, 790, IsVertexArray@4, _dispatch_stub_790, _dispatch_stub_790@4)
-	GL_STUB_ALIAS(PrimitiveRestartIndex, 797, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
-	GL_STUB_ALIAS(BlendEquationSeparate, 800, BlendEquationSeparate@8, _dispatch_stub_800, _dispatch_stub_800@8)
-	GL_STUB_ALIAS(BindFramebuffer, 801, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
-	GL_STUB_ALIAS(BindRenderbuffer, 802, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
-	GL_STUB_ALIAS(CheckFramebufferStatus, 803, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
-	GL_STUB_ALIAS(DeleteFramebuffers, 804, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
-	GL_STUB_ALIAS(DeleteRenderbuffers, 805, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
-	GL_STUB_ALIAS(FramebufferRenderbuffer, 806, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
-	GL_STUB_ALIAS(FramebufferTexture1D, 807, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture2D, 808, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture3D, 809, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
-	GL_STUB_ALIAS(GenFramebuffers, 810, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
-	GL_STUB_ALIAS(GenRenderbuffers, 811, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
-	GL_STUB_ALIAS(GenerateMipmap, 812, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
-	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 813, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB_ALIAS(GetRenderbufferParameteriv, 814, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
-	GL_STUB_ALIAS(IsFramebuffer, 815, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
-	GL_STUB_ALIAS(IsRenderbuffer, 816, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
-	GL_STUB_ALIAS(RenderbufferStorage, 817, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB_ALIAS(BlitFramebuffer, 818, BlitFramebuffer@40, _dispatch_stub_818, _dispatch_stub_818@40)
-	GL_STUB_ALIAS(BindFragDataLocation, 821, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
-	GL_STUB_ALIAS(GetFragDataLocation, 822, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
-	GL_STUB_ALIAS(GetUniformuiv, 823, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIiv, 824, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIuiv, 825, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
-	GL_STUB_ALIAS(Uniform1ui, 826, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
-	GL_STUB_ALIAS(Uniform1uiv, 827, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
-	GL_STUB_ALIAS(Uniform2ui, 828, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
-	GL_STUB_ALIAS(Uniform2uiv, 829, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
-	GL_STUB_ALIAS(Uniform3ui, 830, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
-	GL_STUB_ALIAS(Uniform3uiv, 831, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
-	GL_STUB_ALIAS(Uniform4ui, 832, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
-	GL_STUB_ALIAS(Uniform4uiv, 833, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
-	GL_STUB_ALIAS(VertexAttribI1i, 834, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1iv, 835, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1ui, 836, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1uiv, 837, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2i, 838, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2iv, 839, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2ui, 840, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2uiv, 841, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3i, 842, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3iv, 843, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3ui, 844, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3uiv, 845, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4bv, 846, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4i, 847, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4iv, 848, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4sv, 849, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ubv, 850, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ui, 851, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4uiv, 852, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4usv, 853, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
-	GL_STUB_ALIAS(VertexAttribIPointer, 854, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayer, 855, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(ColorMaski, 856, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
-	GL_STUB_ALIAS(Disablei, 857, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
-	GL_STUB_ALIAS(Enablei, 858, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
-	GL_STUB_ALIAS(GetBooleani_v, 859, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
-	GL_STUB_ALIAS(GetIntegeri_v, 860, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
-	GL_STUB_ALIAS(IsEnabledi, 861, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
-	GL_STUB_ALIAS(GetTexParameterIiv, 864, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
-	GL_STUB_ALIAS(GetTexParameterIuiv, 865, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
-	GL_STUB_ALIAS(TexParameterIiv, 866, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
-	GL_STUB_ALIAS(TexParameterIuiv, 867, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
-	GL_STUB_ALIAS(BeginConditionalRender, 868, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
-	GL_STUB_ALIAS(EndConditionalRender, 869, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
-	GL_STUB_ALIAS(BeginTransformFeedback, 870, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
-	GL_STUB_ALIAS(BindBufferBase, 871, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
-	GL_STUB_ALIAS(BindBufferRange, 873, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
-	GL_STUB_ALIAS(EndTransformFeedback, 874, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
-	GL_STUB_ALIAS(GetTransformFeedbackVarying, 875, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB_ALIAS(TransformFeedbackVaryings, 876, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
-	GL_STUB_ALIAS(ProvokingVertex, 877, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
+	GL_STUB_ALIAS(PointParameterf, 641, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfARB, 641, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfv, 642, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(PointParameterfvARB, 642, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(SecondaryColor3b, 645, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3bv, 646, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3d, 647, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
+	GL_STUB_ALIAS(SecondaryColor3dv, 648, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3f, 649, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3fv, 650, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3i, 651, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3iv, 652, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3s, 653, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3sv, 654, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ub, 655, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3ubv, 656, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ui, 657, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3uiv, 658, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3us, 659, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3usv, 660, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
+	GL_STUB_ALIAS(SecondaryColorPointer, 661, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
+	GL_STUB_ALIAS(MultiDrawArrays, 662, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
+	GL_STUB_ALIAS(MultiDrawElements, 663, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
+	GL_STUB_ALIAS(FogCoordPointer, 664, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
+	GL_STUB_ALIAS(FogCoordd, 665, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
+	GL_STUB_ALIAS(FogCoorddv, 666, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
+	GL_STUB_ALIAS(FogCoordf, 667, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
+	GL_STUB_ALIAS(FogCoordfv, 668, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
+	GL_STUB_ALIAS(BlendFuncSeparate, 670, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
+	GL_STUB_ALIAS(WindowPos2d, 687, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dARB, 687, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dv, 688, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2dvARB, 688, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2f, 689, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fARB, 689, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fv, 690, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2fvARB, 690, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2i, 691, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iARB, 691, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iv, 692, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2ivARB, 692, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2s, 693, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sARB, 693, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sv, 694, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos2svARB, 694, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos3d, 695, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dARB, 695, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dv, 696, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3dvARB, 696, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3f, 697, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fARB, 697, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fv, 698, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3fvARB, 698, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3i, 699, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iARB, 699, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iv, 700, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3ivARB, 700, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3s, 701, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sARB, 701, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sv, 702, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(WindowPos3svARB, 702, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(BindProgramARB, 721, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
+	GL_STUB_ALIAS(DeleteProgramsARB, 722, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
+	GL_STUB_ALIAS(GenProgramsARB, 724, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
+	GL_STUB_ALIAS(GetVertexAttribPointerv, 730, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(GetVertexAttribPointervARB, 730, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(IsProgramARB, 734, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
+	GL_STUB_ALIAS(PointParameteri, 798, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
+	GL_STUB_ALIAS(PointParameteriv, 799, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
+	GL_STUB_ALIAS(DeleteVertexArrays, 802, DeleteVertexArrays@8, _dispatch_stub_802, _dispatch_stub_802@8)
+	GL_STUB_ALIAS(IsVertexArray, 804, IsVertexArray@4, _dispatch_stub_804, _dispatch_stub_804@4)
+	GL_STUB_ALIAS(PrimitiveRestartIndex, 811, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
+	GL_STUB_ALIAS(BlendEquationSeparate, 814, BlendEquationSeparate@8, _dispatch_stub_814, _dispatch_stub_814@8)
+	GL_STUB_ALIAS(BindFramebuffer, 815, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
+	GL_STUB_ALIAS(BindRenderbuffer, 816, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
+	GL_STUB_ALIAS(CheckFramebufferStatus, 817, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
+	GL_STUB_ALIAS(DeleteFramebuffers, 818, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
+	GL_STUB_ALIAS(DeleteRenderbuffers, 819, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
+	GL_STUB_ALIAS(FramebufferRenderbuffer, 820, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
+	GL_STUB_ALIAS(FramebufferTexture1D, 821, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture2D, 822, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture3D, 823, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
+	GL_STUB_ALIAS(GenFramebuffers, 824, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
+	GL_STUB_ALIAS(GenRenderbuffers, 825, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
+	GL_STUB_ALIAS(GenerateMipmap, 826, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
+	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 827, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB_ALIAS(GetRenderbufferParameteriv, 828, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
+	GL_STUB_ALIAS(IsFramebuffer, 829, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
+	GL_STUB_ALIAS(IsRenderbuffer, 830, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
+	GL_STUB_ALIAS(RenderbufferStorage, 831, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
+	GL_STUB_ALIAS(BlitFramebuffer, 832, BlitFramebuffer@40, _dispatch_stub_832, _dispatch_stub_832@40)
+	GL_STUB_ALIAS(BindFragDataLocation, 835, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
+	GL_STUB_ALIAS(GetFragDataLocation, 836, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
+	GL_STUB_ALIAS(GetUniformuiv, 837, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIiv, 838, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIuiv, 839, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
+	GL_STUB_ALIAS(Uniform1ui, 840, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
+	GL_STUB_ALIAS(Uniform1uiv, 841, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
+	GL_STUB_ALIAS(Uniform2ui, 842, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
+	GL_STUB_ALIAS(Uniform2uiv, 843, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
+	GL_STUB_ALIAS(Uniform3ui, 844, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
+	GL_STUB_ALIAS(Uniform3uiv, 845, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
+	GL_STUB_ALIAS(Uniform4ui, 846, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
+	GL_STUB_ALIAS(Uniform4uiv, 847, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
+	GL_STUB_ALIAS(VertexAttribI1i, 848, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1iv, 849, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1ui, 850, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1uiv, 851, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2i, 852, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2iv, 853, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2ui, 854, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2uiv, 855, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3i, 856, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3iv, 857, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3ui, 858, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3uiv, 859, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4bv, 860, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4i, 861, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4iv, 862, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4sv, 863, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ubv, 864, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ui, 865, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4uiv, 866, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4usv, 867, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
+	GL_STUB_ALIAS(VertexAttribIPointer, 868, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayer, 869, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(ColorMaski, 870, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
+	GL_STUB_ALIAS(Disablei, 871, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
+	GL_STUB_ALIAS(Enablei, 872, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
+	GL_STUB_ALIAS(GetBooleani_v, 873, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
+	GL_STUB_ALIAS(GetIntegeri_v, 874, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
+	GL_STUB_ALIAS(IsEnabledi, 875, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
+	GL_STUB_ALIAS(GetTexParameterIiv, 878, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
+	GL_STUB_ALIAS(GetTexParameterIuiv, 879, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
+	GL_STUB_ALIAS(TexParameterIiv, 880, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
+	GL_STUB_ALIAS(TexParameterIuiv, 881, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
+	GL_STUB_ALIAS(BeginConditionalRender, 882, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
+	GL_STUB_ALIAS(EndConditionalRender, 883, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
+	GL_STUB_ALIAS(BeginTransformFeedback, 884, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
+	GL_STUB_ALIAS(BindBufferBase, 885, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
+	GL_STUB_ALIAS(BindBufferRange, 887, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
+	GL_STUB_ALIAS(EndTransformFeedback, 888, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
+	GL_STUB_ALIAS(GetTransformFeedbackVarying, 889, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB_ALIAS(TransformFeedbackVaryings, 890, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
+	GL_STUB_ALIAS(ProvokingVertex, 891, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
 
 		GLOBL	GLNAME(gl_dispatch_functions_end)
 		HIDDEN(GLNAME(gl_dispatch_functions_end))
diff --git a/src/mapi/glapi/glapitable.h b/src/mapi/glapi/glapitable.h
index a9db488cdc5..5b7aeee6796 100644
--- a/src/mapi/glapi/glapitable.h
+++ b/src/mapi/glapi/glapitable.h
@@ -640,300 +640,314 @@ struct _glapi_table
    void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 597 */
    void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 598 */
    void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 599 */
-   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 600 */
-   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 601 */
-   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 602 */
-   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 603 */
-   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 604 */
-   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 605 */
-   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 606 */
-   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 607 */
-   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 608 */
-   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 609 */
-   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 610 */
-   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 611 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 612 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 613 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 614 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 615 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 616 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 617 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 618 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 619 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 620 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 621 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 622 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 623 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 624 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 625 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 626 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 627 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 628 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 629 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 630 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 631 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 632 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 633 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 634 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 635 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 636 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 637 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 638 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 639 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 640 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 641 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 642 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 643 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 644 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 645 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 646 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 647 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 648 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 649 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 650 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 651 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 652 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 653 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 654 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 655 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 656 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 657 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 658 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 659 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 660 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 661 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 662 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 663 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 664 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 665 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 666 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 667 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 668 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 669 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 670 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 671 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 672 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 673 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 674 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 675 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 676 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 677 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 678 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 679 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 680 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 681 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 682 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 683 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 684 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 685 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 686 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 687 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 688 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 689 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 690 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 691 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 692 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 693 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 694 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 695 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 696 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 697 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 698 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 699 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 700 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 701 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 702 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 703 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 704 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 705 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 706 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 707 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 708 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 709 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 710 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 711 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 712 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 713 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 714 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 715 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 716 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 717 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 718 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 719 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 720 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 721 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 722 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 723 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 724 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 725 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 726 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 727 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 728 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 729 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 730 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 731 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 732 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 733 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 734 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 735 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 736 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 737 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 738 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 739 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 740 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 741 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 742 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 743 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 744 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 745 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 746 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 747 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 748 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 749 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 750 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 751 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 752 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 753 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 754 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 755 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 756 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 757 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 758 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 759 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 760 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 761 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 762 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 763 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 764 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 765 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 766 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 767 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 768 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 769 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 770 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 771 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 772 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 773 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 774 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 775 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 776 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 777 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 778 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 779 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 780 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 781 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 782 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 783 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 784 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 785 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 786 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 787 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 788 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 789 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 790 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 791 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 792 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 793 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 794 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 795 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 796 */
-   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 797 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 798 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 799 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 800 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 801 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 802 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 803 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 804 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 805 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 806 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 807 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 808 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 809 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 810 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 811 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 812 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 813 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 814 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 815 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 816 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 817 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 818 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 819 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 820 */
-   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 821 */
-   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 822 */
-   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 823 */
-   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 824 */
-   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 825 */
-   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 826 */
-   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 827 */
-   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 828 */
-   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 829 */
-   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 830 */
-   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 831 */
-   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 832 */
-   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 833 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 834 */
-   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 835 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 836 */
-   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 837 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 838 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 839 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 840 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 841 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 842 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 843 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 844 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 845 */
-   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 846 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 847 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 848 */
-   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 849 */
-   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 850 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 851 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 852 */
-   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 853 */
-   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 854 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 855 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 856 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 857 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 858 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 859 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 860 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 861 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 862 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 863 */
-   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 864 */
-   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 865 */
-   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 866 */
-   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 867 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 868 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 869 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 870 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 871 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 872 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 873 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 874 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 875 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 876 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 877 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 878 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 879 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 880 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 881 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 882 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 883 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 884 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 885 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 886 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 887 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 888 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 889 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 890 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 891 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 892 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 893 */
+   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 600 */
+   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 601 */
+   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 602 */
+   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 603 */
+   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 604 */
+   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 605 */
+   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 606 */
+   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 607 */
+   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 608 */
+   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 609 */
+   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 610 */
+   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 611 */
+   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 612 */
+   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 613 */
+   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 614 */
+   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 615 */
+   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 616 */
+   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 617 */
+   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 618 */
+   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 619 */
+   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 620 */
+   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 621 */
+   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 622 */
+   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 623 */
+   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 624 */
+   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 625 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 626 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 627 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 628 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 629 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 630 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 631 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 632 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 633 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 634 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 635 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 636 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 637 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 638 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 639 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 640 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 641 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 642 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 643 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 644 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 645 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 646 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 647 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 648 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 649 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 650 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 651 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 652 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 653 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 654 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 655 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 656 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 657 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 658 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 659 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 660 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 661 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 662 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 663 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 664 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 665 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 666 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 667 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 668 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 669 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 670 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 671 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 672 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 673 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 674 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 675 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 676 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 677 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 678 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 679 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 680 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 681 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 682 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 683 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 684 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 685 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 686 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 687 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 688 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 689 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 690 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 691 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 692 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 693 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 694 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 695 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 696 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 697 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 698 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 699 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 700 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 701 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 702 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 703 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 704 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 705 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 706 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 707 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 708 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 709 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 710 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 711 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 712 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 713 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 714 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 715 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 716 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 717 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 718 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 719 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 720 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 721 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 722 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 723 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 724 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 725 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 726 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 727 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 728 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 729 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 730 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 731 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 732 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 733 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 734 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 735 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 736 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 737 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 738 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 739 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 740 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 741 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 742 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 743 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 744 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 745 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 746 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 747 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 748 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 749 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 750 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 751 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 752 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 753 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 754 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 755 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 756 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 757 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 758 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 759 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 760 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 761 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 762 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 763 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 764 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 765 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 766 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 767 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 768 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 769 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 770 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 771 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 772 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 773 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 774 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 775 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 776 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 777 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 778 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 779 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 780 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 781 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 782 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 783 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 784 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 785 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 786 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 787 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 788 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 789 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 790 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 791 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 792 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 793 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 794 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 795 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 796 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 797 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 798 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 799 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 800 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 801 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 802 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 803 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 804 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 805 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 806 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 807 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 808 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 809 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 810 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 811 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 812 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 813 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 814 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 815 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 816 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 817 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 818 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 819 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 820 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 821 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 822 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 823 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 824 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 825 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 826 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 827 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 828 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 829 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 830 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 831 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 832 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 833 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 834 */
+   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 835 */
+   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 836 */
+   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 837 */
+   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 838 */
+   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 839 */
+   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 840 */
+   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 841 */
+   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 842 */
+   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 843 */
+   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 844 */
+   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 845 */
+   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 846 */
+   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 847 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 848 */
+   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 849 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 850 */
+   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 851 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 852 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 853 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 854 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 855 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 856 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 857 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 858 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 859 */
+   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 860 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 861 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 862 */
+   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 863 */
+   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 864 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 865 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 866 */
+   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 867 */
+   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 868 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 869 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 870 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 871 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 872 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 873 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 874 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 875 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 876 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 877 */
+   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 878 */
+   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 879 */
+   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 880 */
+   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 881 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 882 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 883 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 884 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 885 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 886 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 887 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 888 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 889 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 890 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 891 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 892 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 893 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 894 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 895 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 896 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 897 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 898 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 899 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 900 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 901 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 902 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 903 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 904 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 905 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 906 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 907 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mapi/glapi/glapitemp.h b/src/mapi/glapi/glapitemp.h
index e756dbb59a2..4eb4861597b 100644
--- a/src/mapi/glapi/glapitemp.h
+++ b/src/mapi/glapi/glapitemp.h
@@ -4062,6 +4062,76 @@ KEYWORD1 void KEYWORD2 NAME(BlendFunciARB)(GLuint buf, GLenum src, GLenum dst)
    DISPATCH(BlendFunciARB, (buf, src, dst), (F, "glBlendFunciARB(%d, 0x%x, 0x%x);\n", buf, src, dst));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BindSampler)(GLuint unit, GLuint sampler)
+{
+   DISPATCH(BindSampler, (unit, sampler), (F, "glBindSampler(%d, %d);\n", unit, sampler));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteSamplers)(GLsizei count, const GLuint * samplers)
+{
+   DISPATCH(DeleteSamplers, (count, samplers), (F, "glDeleteSamplers(%d, %p);\n", count, (const void *) samplers));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenSamplers)(GLsizei count, GLuint * samplers)
+{
+   DISPATCH(GenSamplers, (count, samplers), (F, "glGenSamplers(%d, %p);\n", count, (const void *) samplers));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params)
+{
+   DISPATCH(GetSamplerParameterIiv, (sampler, pname, params), (F, "glGetSamplerParameterIiv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params)
+{
+   DISPATCH(GetSamplerParameterIuiv, (sampler, pname, params), (F, "glGetSamplerParameterIuiv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetSamplerParameterfv, (sampler, pname, params), (F, "glGetSamplerParameterfv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params)
+{
+   DISPATCH(GetSamplerParameteriv, (sampler, pname, params), (F, "glGetSamplerParameteriv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsSampler)(GLuint sampler)
+{
+   RETURN_DISPATCH(IsSampler, (sampler), (F, "glIsSampler(%d);\n", sampler));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params)
+{
+   DISPATCH(SamplerParameterIiv, (sampler, pname, params), (F, "glSamplerParameterIiv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params)
+{
+   DISPATCH(SamplerParameterIuiv, (sampler, pname, params), (F, "glSamplerParameterIuiv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param)
+{
+   DISPATCH(SamplerParameterf, (sampler, pname, param), (F, "glSamplerParameterf(%d, 0x%x, %f);\n", sampler, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(SamplerParameterfv, (sampler, pname, params), (F, "glSamplerParameterfv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameteri)(GLuint sampler, GLenum pname, GLint param)
+{
+   DISPATCH(SamplerParameteri, (sampler, pname, param), (F, "glSamplerParameteri(%d, 0x%x, %d);\n", sampler, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params)
+{
+   DISPATCH(SamplerParameteriv, (sampler, pname, params), (F, "glSamplerParameteriv(%d, 0x%x, %p);\n", sampler, pname, (const void *) params));
+}
+
 KEYWORD1 void KEYWORD2 NAME(BindTransformFeedback)(GLenum target, GLuint id)
 {
    DISPATCH(BindTransformFeedback, (target, id), (F, "glBindTransformFeedback(0x%x, %d);\n", target, id));
@@ -4127,58 +4197,58 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_627)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_627)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_614)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_628)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_614)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_628)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_615)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_629)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_615)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_629)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_616)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_630)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_616)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_630)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_617)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_631)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_617)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_631)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_618)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_632)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_618)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_632)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_633)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_633)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_634)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_634)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4228,9 +4298,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_627)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_641)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_627)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_641)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4250,9 +4320,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_628)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_642)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_628)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_642)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4507,9 +4577,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_669)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_669)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4524,9 +4594,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_670)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_670)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4891,65 +4961,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_714)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_714)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_715)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_715)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_716)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_716)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_703)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_717)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_703)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_717)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_718)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_718)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_705)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_719)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_705)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_719)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5394,16 +5464,16 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_801)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_801)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
@@ -5413,16 +5483,16 @@ KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_803)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_803)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
@@ -5432,9 +5502,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_804)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_804)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5484,9 +5554,9 @@ KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
    DISPATCH(PrimitiveRestartNV, (), (F, "glPrimitiveRestartNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_799)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_813)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_799)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_813)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5496,9 +5566,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_814)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_814)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5678,23 +5748,23 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_818)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_832)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_818)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_832)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_819)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_833)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_819)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_833)(GLenum target, GLenum pname, GLint param)
 {
    DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_820)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_834)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_820)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_834)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
 }
@@ -6254,16 +6324,16 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_878)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_892)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_878)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_892)(GLenum target, GLenum pname, GLvoid ** params)
 {
    DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_879)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_893)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_879)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_893)(GLenum target, GLsizei length, GLvoid * pointer)
 {
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
@@ -6303,37 +6373,37 @@ KEYWORD1 void KEYWORD2 NAME(TextureBarrierNV)(void)
    DISPATCH(TextureBarrierNV, (), (F, "glTextureBarrierNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_887)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_901)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_887)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_901)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_888)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_888)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_889)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_889)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_890)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_890)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_891)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_891)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -7101,6 +7171,20 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(BlendEquationiARB),
    TABLE_ENTRY(BlendFuncSeparateiARB),
    TABLE_ENTRY(BlendFunciARB),
+   TABLE_ENTRY(BindSampler),
+   TABLE_ENTRY(DeleteSamplers),
+   TABLE_ENTRY(GenSamplers),
+   TABLE_ENTRY(GetSamplerParameterIiv),
+   TABLE_ENTRY(GetSamplerParameterIuiv),
+   TABLE_ENTRY(GetSamplerParameterfv),
+   TABLE_ENTRY(GetSamplerParameteriv),
+   TABLE_ENTRY(IsSampler),
+   TABLE_ENTRY(SamplerParameterIiv),
+   TABLE_ENTRY(SamplerParameterIuiv),
+   TABLE_ENTRY(SamplerParameterf),
+   TABLE_ENTRY(SamplerParameterfv),
+   TABLE_ENTRY(SamplerParameteri),
+   TABLE_ENTRY(SamplerParameteriv),
    TABLE_ENTRY(BindTransformFeedback),
    TABLE_ENTRY(DeleteTransformFeedbacks),
    TABLE_ENTRY(DrawTransformFeedback),
@@ -7114,14 +7198,14 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ReleaseShaderCompiler),
    TABLE_ENTRY(ShaderBinary),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_613),
-   TABLE_ENTRY(_dispatch_stub_614),
-   TABLE_ENTRY(_dispatch_stub_615),
-   TABLE_ENTRY(_dispatch_stub_616),
-   TABLE_ENTRY(_dispatch_stub_617),
-   TABLE_ENTRY(_dispatch_stub_618),
-   TABLE_ENTRY(_dispatch_stub_619),
-   TABLE_ENTRY(_dispatch_stub_620),
+   TABLE_ENTRY(_dispatch_stub_627),
+   TABLE_ENTRY(_dispatch_stub_628),
+   TABLE_ENTRY(_dispatch_stub_629),
+   TABLE_ENTRY(_dispatch_stub_630),
+   TABLE_ENTRY(_dispatch_stub_631),
+   TABLE_ENTRY(_dispatch_stub_632),
+   TABLE_ENTRY(_dispatch_stub_633),
+   TABLE_ENTRY(_dispatch_stub_634),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -7156,7 +7240,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_655),
+   TABLE_ENTRY(_dispatch_stub_669),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -7198,15 +7282,15 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_697),
-   TABLE_ENTRY(_dispatch_stub_698),
-   TABLE_ENTRY(_dispatch_stub_699),
-   TABLE_ENTRY(_dispatch_stub_700),
-   TABLE_ENTRY(_dispatch_stub_701),
-   TABLE_ENTRY(_dispatch_stub_702),
-   TABLE_ENTRY(_dispatch_stub_703),
-   TABLE_ENTRY(_dispatch_stub_704),
-   TABLE_ENTRY(_dispatch_stub_705),
+   TABLE_ENTRY(_dispatch_stub_711),
+   TABLE_ENTRY(_dispatch_stub_712),
+   TABLE_ENTRY(_dispatch_stub_713),
+   TABLE_ENTRY(_dispatch_stub_714),
+   TABLE_ENTRY(_dispatch_stub_715),
+   TABLE_ENTRY(_dispatch_stub_716),
+   TABLE_ENTRY(_dispatch_stub_717),
+   TABLE_ENTRY(_dispatch_stub_718),
+   TABLE_ENTRY(_dispatch_stub_719),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -7287,11 +7371,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_786),
-   TABLE_ENTRY(_dispatch_stub_787),
-   TABLE_ENTRY(_dispatch_stub_788),
-   TABLE_ENTRY(_dispatch_stub_789),
-   TABLE_ENTRY(_dispatch_stub_790),
+   TABLE_ENTRY(_dispatch_stub_800),
+   TABLE_ENTRY(_dispatch_stub_801),
+   TABLE_ENTRY(_dispatch_stub_802),
+   TABLE_ENTRY(_dispatch_stub_803),
+   TABLE_ENTRY(_dispatch_stub_804),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
@@ -7300,8 +7384,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
    TABLE_ENTRY(PrimitiveRestartIndexNV),
    TABLE_ENTRY(PrimitiveRestartNV),
-   TABLE_ENTRY(_dispatch_stub_799),
-   TABLE_ENTRY(_dispatch_stub_800),
+   TABLE_ENTRY(_dispatch_stub_813),
+   TABLE_ENTRY(_dispatch_stub_814),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -7319,9 +7403,9 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_818),
-   TABLE_ENTRY(_dispatch_stub_819),
-   TABLE_ENTRY(_dispatch_stub_820),
+   TABLE_ENTRY(_dispatch_stub_832),
+   TABLE_ENTRY(_dispatch_stub_833),
+   TABLE_ENTRY(_dispatch_stub_834),
    TABLE_ENTRY(BindFragDataLocationEXT),
    TABLE_ENTRY(GetFragDataLocationEXT),
    TABLE_ENTRY(GetUniformuivEXT),
@@ -7379,8 +7463,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetTransformFeedbackVaryingEXT),
    TABLE_ENTRY(TransformFeedbackVaryingsEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_878),
-   TABLE_ENTRY(_dispatch_stub_879),
+   TABLE_ENTRY(_dispatch_stub_892),
+   TABLE_ENTRY(_dispatch_stub_893),
    TABLE_ENTRY(GetObjectParameterivAPPLE),
    TABLE_ENTRY(ObjectPurgeableAPPLE),
    TABLE_ENTRY(ObjectUnpurgeableAPPLE),
@@ -7388,11 +7472,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(CreateShaderProgramEXT),
    TABLE_ENTRY(UseShaderProgramEXT),
    TABLE_ENTRY(TextureBarrierNV),
-   TABLE_ENTRY(_dispatch_stub_887),
-   TABLE_ENTRY(_dispatch_stub_888),
-   TABLE_ENTRY(_dispatch_stub_889),
-   TABLE_ENTRY(_dispatch_stub_890),
-   TABLE_ENTRY(_dispatch_stub_891),
+   TABLE_ENTRY(_dispatch_stub_901),
+   TABLE_ENTRY(_dispatch_stub_902),
+   TABLE_ENTRY(_dispatch_stub_903),
+   TABLE_ENTRY(_dispatch_stub_904),
+   TABLE_ENTRY(_dispatch_stub_905),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
@@ -7699,10 +7783,10 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(RenderbufferStorageMultisampleEXT),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfARB),
-   TABLE_ENTRY(_dispatch_stub_627),
+   TABLE_ENTRY(_dispatch_stub_641),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameterfvARB),
-   TABLE_ENTRY(_dispatch_stub_628),
+   TABLE_ENTRY(_dispatch_stub_642),
    TABLE_ENTRY(SecondaryColor3b),
    TABLE_ENTRY(SecondaryColor3bv),
    TABLE_ENTRY(SecondaryColor3d),
@@ -7728,7 +7812,7 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoordf),
    TABLE_ENTRY(FogCoordfv),
    TABLE_ENTRY(BlendFuncSeparate),
-   TABLE_ENTRY(_dispatch_stub_656),
+   TABLE_ENTRY(_dispatch_stub_670),
    TABLE_ENTRY(WindowPos2d),
    TABLE_ENTRY(WindowPos2dARB),
    TABLE_ENTRY(WindowPos2dv),
diff --git a/src/mapi/glapi/glprocs.h b/src/mapi/glapi/glprocs.h
index 9aad6cceab5..b11bca21cc5 100644
--- a/src/mapi/glapi/glprocs.h
+++ b/src/mapi/glapi/glprocs.h
@@ -652,6 +652,20 @@ static const char gl_string_table[] =
     "glBlendEquationiARB\0"
     "glBlendFuncSeparateiARB\0"
     "glBlendFunciARB\0"
+    "glBindSampler\0"
+    "glDeleteSamplers\0"
+    "glGenSamplers\0"
+    "glGetSamplerParameterIiv\0"
+    "glGetSamplerParameterIuiv\0"
+    "glGetSamplerParameterfv\0"
+    "glGetSamplerParameteriv\0"
+    "glIsSampler\0"
+    "glSamplerParameterIiv\0"
+    "glSamplerParameterIuiv\0"
+    "glSamplerParameterf\0"
+    "glSamplerParameterfv\0"
+    "glSamplerParameteri\0"
+    "glSamplerParameteriv\0"
     "glBindTransformFeedback\0"
     "glDeleteTransformFeedbacks\0"
     "glDrawTransformFeedback\0"
@@ -1322,41 +1336,41 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_613 mgl_dispatch_stub_613
-#define gl_dispatch_stub_614 mgl_dispatch_stub_614
-#define gl_dispatch_stub_615 mgl_dispatch_stub_615
-#define gl_dispatch_stub_616 mgl_dispatch_stub_616
-#define gl_dispatch_stub_617 mgl_dispatch_stub_617
-#define gl_dispatch_stub_618 mgl_dispatch_stub_618
-#define gl_dispatch_stub_619 mgl_dispatch_stub_619
-#define gl_dispatch_stub_620 mgl_dispatch_stub_620
-#define gl_dispatch_stub_655 mgl_dispatch_stub_655
-#define gl_dispatch_stub_697 mgl_dispatch_stub_697
-#define gl_dispatch_stub_698 mgl_dispatch_stub_698
-#define gl_dispatch_stub_699 mgl_dispatch_stub_699
-#define gl_dispatch_stub_700 mgl_dispatch_stub_700
-#define gl_dispatch_stub_701 mgl_dispatch_stub_701
-#define gl_dispatch_stub_702 mgl_dispatch_stub_702
-#define gl_dispatch_stub_703 mgl_dispatch_stub_703
-#define gl_dispatch_stub_704 mgl_dispatch_stub_704
-#define gl_dispatch_stub_705 mgl_dispatch_stub_705
-#define gl_dispatch_stub_786 mgl_dispatch_stub_786
-#define gl_dispatch_stub_787 mgl_dispatch_stub_787
-#define gl_dispatch_stub_788 mgl_dispatch_stub_788
-#define gl_dispatch_stub_789 mgl_dispatch_stub_789
-#define gl_dispatch_stub_790 mgl_dispatch_stub_790
-#define gl_dispatch_stub_799 mgl_dispatch_stub_799
+#define gl_dispatch_stub_627 mgl_dispatch_stub_627
+#define gl_dispatch_stub_628 mgl_dispatch_stub_628
+#define gl_dispatch_stub_629 mgl_dispatch_stub_629
+#define gl_dispatch_stub_630 mgl_dispatch_stub_630
+#define gl_dispatch_stub_631 mgl_dispatch_stub_631
+#define gl_dispatch_stub_632 mgl_dispatch_stub_632
+#define gl_dispatch_stub_633 mgl_dispatch_stub_633
+#define gl_dispatch_stub_634 mgl_dispatch_stub_634
+#define gl_dispatch_stub_669 mgl_dispatch_stub_669
+#define gl_dispatch_stub_711 mgl_dispatch_stub_711
+#define gl_dispatch_stub_712 mgl_dispatch_stub_712
+#define gl_dispatch_stub_713 mgl_dispatch_stub_713
+#define gl_dispatch_stub_714 mgl_dispatch_stub_714
+#define gl_dispatch_stub_715 mgl_dispatch_stub_715
+#define gl_dispatch_stub_716 mgl_dispatch_stub_716
+#define gl_dispatch_stub_717 mgl_dispatch_stub_717
+#define gl_dispatch_stub_718 mgl_dispatch_stub_718
+#define gl_dispatch_stub_719 mgl_dispatch_stub_719
 #define gl_dispatch_stub_800 mgl_dispatch_stub_800
-#define gl_dispatch_stub_818 mgl_dispatch_stub_818
-#define gl_dispatch_stub_819 mgl_dispatch_stub_819
-#define gl_dispatch_stub_820 mgl_dispatch_stub_820
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_879 mgl_dispatch_stub_879
-#define gl_dispatch_stub_887 mgl_dispatch_stub_887
-#define gl_dispatch_stub_888 mgl_dispatch_stub_888
-#define gl_dispatch_stub_889 mgl_dispatch_stub_889
-#define gl_dispatch_stub_890 mgl_dispatch_stub_890
-#define gl_dispatch_stub_891 mgl_dispatch_stub_891
+#define gl_dispatch_stub_801 mgl_dispatch_stub_801
+#define gl_dispatch_stub_802 mgl_dispatch_stub_802
+#define gl_dispatch_stub_803 mgl_dispatch_stub_803
+#define gl_dispatch_stub_804 mgl_dispatch_stub_804
+#define gl_dispatch_stub_813 mgl_dispatch_stub_813
+#define gl_dispatch_stub_814 mgl_dispatch_stub_814
+#define gl_dispatch_stub_832 mgl_dispatch_stub_832
+#define gl_dispatch_stub_833 mgl_dispatch_stub_833
+#define gl_dispatch_stub_834 mgl_dispatch_stub_834
+#define gl_dispatch_stub_892 mgl_dispatch_stub_892
+#define gl_dispatch_stub_893 mgl_dispatch_stub_893
+#define gl_dispatch_stub_901 mgl_dispatch_stub_901
+#define gl_dispatch_stub_902 mgl_dispatch_stub_902
+#define gl_dispatch_stub_903 mgl_dispatch_stub_903
+#define gl_dispatch_stub_904 mgl_dispatch_stub_904
+#define gl_dispatch_stub_905 mgl_dispatch_stub_905
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1374,41 +1388,41 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_613(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_614(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_615(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_616(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_617(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_618(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_619(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_620(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_655(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_697(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_698(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_699(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_700(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_701(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_702(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_703(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_704(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_705(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_786(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_787(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_788(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_789(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_790(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_799(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_800(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_818(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_819(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_820(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_878(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_879(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_887(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_888(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_889(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_890(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_891(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_627(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_628(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_629(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_630(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_631(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_632(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_633(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_634(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_669(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_711(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_712(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_713(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_714(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_715(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_716(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_717(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_718(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_719(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_800(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_801(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_802(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_803(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_804(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_813(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_814(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_832(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_833(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_834(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_892(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_893(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_901(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_902(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_903(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_904(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_905(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2012,659 +2026,673 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 9657, glBlendEquationiARB, glBlendEquationiARB, NULL, 597),
     NAME_FUNC_OFFSET( 9677, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 598),
     NAME_FUNC_OFFSET( 9701, glBlendFunciARB, glBlendFunciARB, NULL, 599),
-    NAME_FUNC_OFFSET( 9717, glBindTransformFeedback, glBindTransformFeedback, NULL, 600),
-    NAME_FUNC_OFFSET( 9741, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 601),
-    NAME_FUNC_OFFSET( 9768, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 602),
-    NAME_FUNC_OFFSET( 9792, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 603),
-    NAME_FUNC_OFFSET( 9816, glIsTransformFeedback, glIsTransformFeedback, NULL, 604),
-    NAME_FUNC_OFFSET( 9838, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 605),
-    NAME_FUNC_OFFSET( 9863, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 606),
-    NAME_FUNC_OFFSET( 9889, glClearDepthf, glClearDepthf, NULL, 607),
-    NAME_FUNC_OFFSET( 9903, glDepthRangef, glDepthRangef, NULL, 608),
-    NAME_FUNC_OFFSET( 9917, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 609),
-    NAME_FUNC_OFFSET( 9944, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 610),
-    NAME_FUNC_OFFSET( 9968, glShaderBinary, glShaderBinary, NULL, 611),
-    NAME_FUNC_OFFSET( 9983, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 612),
-    NAME_FUNC_OFFSET(10002, gl_dispatch_stub_613, gl_dispatch_stub_613, NULL, 613),
-    NAME_FUNC_OFFSET(10034, gl_dispatch_stub_614, gl_dispatch_stub_614, NULL, 614),
-    NAME_FUNC_OFFSET(10066, gl_dispatch_stub_615, gl_dispatch_stub_615, NULL, 615),
-    NAME_FUNC_OFFSET(10094, gl_dispatch_stub_616, gl_dispatch_stub_616, NULL, 616),
-    NAME_FUNC_OFFSET(10123, gl_dispatch_stub_617, gl_dispatch_stub_617, NULL, 617),
-    NAME_FUNC_OFFSET(10151, gl_dispatch_stub_618, gl_dispatch_stub_618, NULL, 618),
-    NAME_FUNC_OFFSET(10180, gl_dispatch_stub_619, gl_dispatch_stub_619, NULL, 619),
-    NAME_FUNC_OFFSET(10197, gl_dispatch_stub_620, gl_dispatch_stub_620, NULL, 620),
-    NAME_FUNC_OFFSET(10217, glColorPointerEXT, glColorPointerEXT, NULL, 621),
-    NAME_FUNC_OFFSET(10235, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 622),
-    NAME_FUNC_OFFSET(10256, glIndexPointerEXT, glIndexPointerEXT, NULL, 623),
-    NAME_FUNC_OFFSET(10274, glNormalPointerEXT, glNormalPointerEXT, NULL, 624),
-    NAME_FUNC_OFFSET(10293, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 625),
-    NAME_FUNC_OFFSET(10314, glVertexPointerEXT, glVertexPointerEXT, NULL, 626),
-    NAME_FUNC_OFFSET(10333, glPointParameterfEXT, glPointParameterfEXT, NULL, 627),
-    NAME_FUNC_OFFSET(10354, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 628),
-    NAME_FUNC_OFFSET(10376, glLockArraysEXT, glLockArraysEXT, NULL, 629),
-    NAME_FUNC_OFFSET(10392, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 630),
-    NAME_FUNC_OFFSET(10410, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 631),
-    NAME_FUNC_OFFSET(10432, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 632),
-    NAME_FUNC_OFFSET(10455, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 633),
-    NAME_FUNC_OFFSET(10477, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 634),
-    NAME_FUNC_OFFSET(10500, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 635),
-    NAME_FUNC_OFFSET(10522, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 636),
-    NAME_FUNC_OFFSET(10545, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 637),
-    NAME_FUNC_OFFSET(10567, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 638),
-    NAME_FUNC_OFFSET(10590, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 639),
-    NAME_FUNC_OFFSET(10612, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 640),
-    NAME_FUNC_OFFSET(10635, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 641),
-    NAME_FUNC_OFFSET(10658, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 642),
-    NAME_FUNC_OFFSET(10682, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 643),
-    NAME_FUNC_OFFSET(10705, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 644),
-    NAME_FUNC_OFFSET(10729, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 645),
-    NAME_FUNC_OFFSET(10752, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 646),
-    NAME_FUNC_OFFSET(10776, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 647),
-    NAME_FUNC_OFFSET(10803, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 648),
-    NAME_FUNC_OFFSET(10824, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 649),
-    NAME_FUNC_OFFSET(10847, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 650),
-    NAME_FUNC_OFFSET(10868, glFogCoorddEXT, glFogCoorddEXT, NULL, 651),
-    NAME_FUNC_OFFSET(10883, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 652),
-    NAME_FUNC_OFFSET(10899, glFogCoordfEXT, glFogCoordfEXT, NULL, 653),
-    NAME_FUNC_OFFSET(10914, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 654),
-    NAME_FUNC_OFFSET(10930, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, 655),
-    NAME_FUNC_OFFSET(10948, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 656),
-    NAME_FUNC_OFFSET(10971, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 657),
-    NAME_FUNC_OFFSET(10997, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 658),
-    NAME_FUNC_OFFSET(11018, glCombinerInputNV, glCombinerInputNV, NULL, 659),
-    NAME_FUNC_OFFSET(11036, glCombinerOutputNV, glCombinerOutputNV, NULL, 660),
-    NAME_FUNC_OFFSET(11055, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 661),
-    NAME_FUNC_OFFSET(11078, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 662),
-    NAME_FUNC_OFFSET(11102, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 663),
-    NAME_FUNC_OFFSET(11125, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 664),
-    NAME_FUNC_OFFSET(11149, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 665),
-    NAME_FUNC_OFFSET(11172, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 666),
-    NAME_FUNC_OFFSET(11204, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 667),
-    NAME_FUNC_OFFSET(11236, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 668),
-    NAME_FUNC_OFFSET(11269, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 669),
-    NAME_FUNC_OFFSET(11302, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 670),
-    NAME_FUNC_OFFSET(11339, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 671),
-    NAME_FUNC_OFFSET(11376, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 672),
-    NAME_FUNC_OFFSET(11396, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 673),
-    NAME_FUNC_OFFSET(11414, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 674),
-    NAME_FUNC_OFFSET(11433, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 675),
-    NAME_FUNC_OFFSET(11451, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 676),
-    NAME_FUNC_OFFSET(11470, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 677),
-    NAME_FUNC_OFFSET(11488, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 678),
-    NAME_FUNC_OFFSET(11507, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 679),
-    NAME_FUNC_OFFSET(11525, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 680),
-    NAME_FUNC_OFFSET(11544, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 681),
-    NAME_FUNC_OFFSET(11562, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 682),
-    NAME_FUNC_OFFSET(11581, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 683),
-    NAME_FUNC_OFFSET(11599, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 684),
-    NAME_FUNC_OFFSET(11618, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 685),
-    NAME_FUNC_OFFSET(11636, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 686),
-    NAME_FUNC_OFFSET(11655, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 687),
-    NAME_FUNC_OFFSET(11673, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 688),
-    NAME_FUNC_OFFSET(11692, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 689),
-    NAME_FUNC_OFFSET(11710, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 690),
-    NAME_FUNC_OFFSET(11729, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 691),
-    NAME_FUNC_OFFSET(11747, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 692),
-    NAME_FUNC_OFFSET(11766, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 693),
-    NAME_FUNC_OFFSET(11784, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 694),
-    NAME_FUNC_OFFSET(11803, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 695),
-    NAME_FUNC_OFFSET(11821, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 696),
-    NAME_FUNC_OFFSET(11840, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL, 697),
-    NAME_FUNC_OFFSET(11865, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
-    NAME_FUNC_OFFSET(11892, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
-    NAME_FUNC_OFFSET(11909, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
-    NAME_FUNC_OFFSET(11925, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
-    NAME_FUNC_OFFSET(11939, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
-    NAME_FUNC_OFFSET(11954, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
-    NAME_FUNC_OFFSET(11966, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
-    NAME_FUNC_OFFSET(11979, gl_dispatch_stub_705, gl_dispatch_stub_705, NULL, 705),
-    NAME_FUNC_OFFSET(11993, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 706),
-    NAME_FUNC_OFFSET(12017, glBindProgramNV, glBindProgramNV, NULL, 707),
-    NAME_FUNC_OFFSET(12033, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 708),
-    NAME_FUNC_OFFSET(12052, glExecuteProgramNV, glExecuteProgramNV, NULL, 709),
-    NAME_FUNC_OFFSET(12071, glGenProgramsNV, glGenProgramsNV, NULL, 710),
-    NAME_FUNC_OFFSET(12087, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 711),
-    NAME_FUNC_OFFSET(12113, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 712),
-    NAME_FUNC_OFFSET(12139, glGetProgramStringNV, glGetProgramStringNV, NULL, 713),
-    NAME_FUNC_OFFSET(12160, glGetProgramivNV, glGetProgramivNV, NULL, 714),
-    NAME_FUNC_OFFSET(12177, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 715),
-    NAME_FUNC_OFFSET(12198, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 716),
-    NAME_FUNC_OFFSET(12226, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 717),
-    NAME_FUNC_OFFSET(12248, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 718),
-    NAME_FUNC_OFFSET(12270, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 719),
-    NAME_FUNC_OFFSET(12292, glIsProgramNV, glIsProgramNV, NULL, 720),
-    NAME_FUNC_OFFSET(12306, glLoadProgramNV, glLoadProgramNV, NULL, 721),
-    NAME_FUNC_OFFSET(12322, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 722),
-    NAME_FUNC_OFFSET(12347, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 723),
-    NAME_FUNC_OFFSET(12372, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 724),
-    NAME_FUNC_OFFSET(12400, glTrackMatrixNV, glTrackMatrixNV, NULL, 725),
-    NAME_FUNC_OFFSET(12416, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 726),
-    NAME_FUNC_OFFSET(12435, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 727),
-    NAME_FUNC_OFFSET(12455, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 728),
-    NAME_FUNC_OFFSET(12474, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 729),
-    NAME_FUNC_OFFSET(12494, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 730),
-    NAME_FUNC_OFFSET(12513, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 731),
-    NAME_FUNC_OFFSET(12533, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 732),
-    NAME_FUNC_OFFSET(12552, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 733),
-    NAME_FUNC_OFFSET(12572, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 734),
-    NAME_FUNC_OFFSET(12591, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 735),
-    NAME_FUNC_OFFSET(12611, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 736),
-    NAME_FUNC_OFFSET(12630, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 737),
-    NAME_FUNC_OFFSET(12650, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 738),
-    NAME_FUNC_OFFSET(12669, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 739),
-    NAME_FUNC_OFFSET(12689, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 740),
-    NAME_FUNC_OFFSET(12708, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 741),
-    NAME_FUNC_OFFSET(12728, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 742),
-    NAME_FUNC_OFFSET(12747, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 743),
-    NAME_FUNC_OFFSET(12767, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 744),
-    NAME_FUNC_OFFSET(12786, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 745),
-    NAME_FUNC_OFFSET(12806, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 746),
-    NAME_FUNC_OFFSET(12825, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 747),
-    NAME_FUNC_OFFSET(12845, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 748),
-    NAME_FUNC_OFFSET(12864, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 749),
-    NAME_FUNC_OFFSET(12884, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 750),
-    NAME_FUNC_OFFSET(12904, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 751),
-    NAME_FUNC_OFFSET(12925, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 752),
-    NAME_FUNC_OFFSET(12949, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 753),
-    NAME_FUNC_OFFSET(12970, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 754),
-    NAME_FUNC_OFFSET(12991, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 755),
-    NAME_FUNC_OFFSET(13012, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 756),
-    NAME_FUNC_OFFSET(13033, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 757),
-    NAME_FUNC_OFFSET(13054, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 758),
-    NAME_FUNC_OFFSET(13075, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 759),
-    NAME_FUNC_OFFSET(13096, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 760),
-    NAME_FUNC_OFFSET(13117, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 761),
-    NAME_FUNC_OFFSET(13138, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 762),
-    NAME_FUNC_OFFSET(13159, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 763),
-    NAME_FUNC_OFFSET(13180, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 764),
-    NAME_FUNC_OFFSET(13201, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 765),
-    NAME_FUNC_OFFSET(13223, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 766),
-    NAME_FUNC_OFFSET(13250, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 767),
-    NAME_FUNC_OFFSET(13277, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 768),
-    NAME_FUNC_OFFSET(13301, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 769),
-    NAME_FUNC_OFFSET(13325, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 770),
-    NAME_FUNC_OFFSET(13347, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 771),
-    NAME_FUNC_OFFSET(13369, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 772),
-    NAME_FUNC_OFFSET(13391, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 773),
-    NAME_FUNC_OFFSET(13416, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 774),
-    NAME_FUNC_OFFSET(13440, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 775),
-    NAME_FUNC_OFFSET(13462, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 776),
-    NAME_FUNC_OFFSET(13484, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 777),
-    NAME_FUNC_OFFSET(13506, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 778),
-    NAME_FUNC_OFFSET(13532, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 779),
-    NAME_FUNC_OFFSET(13555, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 780),
-    NAME_FUNC_OFFSET(13579, glPassTexCoordATI, glPassTexCoordATI, NULL, 781),
-    NAME_FUNC_OFFSET(13597, glSampleMapATI, glSampleMapATI, NULL, 782),
-    NAME_FUNC_OFFSET(13612, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 783),
-    NAME_FUNC_OFFSET(13643, glPointParameteriNV, glPointParameteriNV, NULL, 784),
-    NAME_FUNC_OFFSET(13663, glPointParameterivNV, glPointParameterivNV, NULL, 785),
-    NAME_FUNC_OFFSET(13684, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
-    NAME_FUNC_OFFSET(13707, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
-    NAME_FUNC_OFFSET(13730, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
-    NAME_FUNC_OFFSET(13756, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, 789),
-    NAME_FUNC_OFFSET(13779, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, 790),
-    NAME_FUNC_OFFSET(13800, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 791),
-    NAME_FUNC_OFFSET(13831, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 792),
-    NAME_FUNC_OFFSET(13862, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 793),
-    NAME_FUNC_OFFSET(13890, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 794),
-    NAME_FUNC_OFFSET(13919, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 795),
-    NAME_FUNC_OFFSET(13947, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 796),
-    NAME_FUNC_OFFSET(13976, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 797),
-    NAME_FUNC_OFFSET(14002, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 798),
-    NAME_FUNC_OFFSET(14023, gl_dispatch_stub_799, gl_dispatch_stub_799, NULL, 799),
-    NAME_FUNC_OFFSET(14040, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, 800),
-    NAME_FUNC_OFFSET(14067, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 801),
-    NAME_FUNC_OFFSET(14088, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 802),
-    NAME_FUNC_OFFSET(14110, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 803),
-    NAME_FUNC_OFFSET(14138, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 804),
-    NAME_FUNC_OFFSET(14162, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 805),
-    NAME_FUNC_OFFSET(14187, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 806),
-    NAME_FUNC_OFFSET(14216, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 807),
-    NAME_FUNC_OFFSET(14242, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 808),
-    NAME_FUNC_OFFSET(14268, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 809),
-    NAME_FUNC_OFFSET(14294, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 810),
-    NAME_FUNC_OFFSET(14315, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 811),
-    NAME_FUNC_OFFSET(14337, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 812),
-    NAME_FUNC_OFFSET(14357, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 813),
-    NAME_FUNC_OFFSET(14398, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 814),
-    NAME_FUNC_OFFSET(14430, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 815),
-    NAME_FUNC_OFFSET(14449, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 816),
-    NAME_FUNC_OFFSET(14469, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 817),
-    NAME_FUNC_OFFSET(14494, gl_dispatch_stub_818, gl_dispatch_stub_818, NULL, 818),
-    NAME_FUNC_OFFSET(14515, gl_dispatch_stub_819, gl_dispatch_stub_819, NULL, 819),
-    NAME_FUNC_OFFSET(14539, gl_dispatch_stub_820, gl_dispatch_stub_820, NULL, 820),
-    NAME_FUNC_OFFSET(14569, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 821),
-    NAME_FUNC_OFFSET(14595, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 822),
-    NAME_FUNC_OFFSET(14620, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 823),
-    NAME_FUNC_OFFSET(14639, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 824),
-    NAME_FUNC_OFFSET(14663, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 825),
-    NAME_FUNC_OFFSET(14688, glUniform1uiEXT, glUniform1uiEXT, NULL, 826),
-    NAME_FUNC_OFFSET(14704, glUniform1uivEXT, glUniform1uivEXT, NULL, 827),
-    NAME_FUNC_OFFSET(14721, glUniform2uiEXT, glUniform2uiEXT, NULL, 828),
-    NAME_FUNC_OFFSET(14737, glUniform2uivEXT, glUniform2uivEXT, NULL, 829),
-    NAME_FUNC_OFFSET(14754, glUniform3uiEXT, glUniform3uiEXT, NULL, 830),
-    NAME_FUNC_OFFSET(14770, glUniform3uivEXT, glUniform3uivEXT, NULL, 831),
-    NAME_FUNC_OFFSET(14787, glUniform4uiEXT, glUniform4uiEXT, NULL, 832),
-    NAME_FUNC_OFFSET(14803, glUniform4uivEXT, glUniform4uivEXT, NULL, 833),
-    NAME_FUNC_OFFSET(14820, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 834),
-    NAME_FUNC_OFFSET(14841, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 835),
-    NAME_FUNC_OFFSET(14863, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 836),
-    NAME_FUNC_OFFSET(14885, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 837),
-    NAME_FUNC_OFFSET(14908, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 838),
-    NAME_FUNC_OFFSET(14929, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 839),
-    NAME_FUNC_OFFSET(14951, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 840),
-    NAME_FUNC_OFFSET(14973, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 841),
-    NAME_FUNC_OFFSET(14996, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 842),
-    NAME_FUNC_OFFSET(15017, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 843),
-    NAME_FUNC_OFFSET(15039, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 844),
-    NAME_FUNC_OFFSET(15061, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 845),
-    NAME_FUNC_OFFSET(15084, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 846),
-    NAME_FUNC_OFFSET(15106, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 847),
-    NAME_FUNC_OFFSET(15127, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 848),
-    NAME_FUNC_OFFSET(15149, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 849),
-    NAME_FUNC_OFFSET(15171, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 850),
-    NAME_FUNC_OFFSET(15194, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 851),
-    NAME_FUNC_OFFSET(15216, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 852),
-    NAME_FUNC_OFFSET(15239, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 853),
-    NAME_FUNC_OFFSET(15262, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 854),
-    NAME_FUNC_OFFSET(15288, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 855),
-    NAME_FUNC_OFFSET(15317, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 856),
-    NAME_FUNC_OFFSET(15339, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 857),
-    NAME_FUNC_OFFSET(15359, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 858),
-    NAME_FUNC_OFFSET(15378, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 859),
-    NAME_FUNC_OFFSET(15402, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 860),
-    NAME_FUNC_OFFSET(15426, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 861),
-    NAME_FUNC_OFFSET(15448, glClearColorIiEXT, glClearColorIiEXT, NULL, 862),
-    NAME_FUNC_OFFSET(15466, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 863),
-    NAME_FUNC_OFFSET(15485, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 864),
-    NAME_FUNC_OFFSET(15509, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 865),
-    NAME_FUNC_OFFSET(15534, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 866),
-    NAME_FUNC_OFFSET(15555, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 867),
-    NAME_FUNC_OFFSET(15577, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 868),
-    NAME_FUNC_OFFSET(15604, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 869),
-    NAME_FUNC_OFFSET(15629, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 870),
-    NAME_FUNC_OFFSET(15657, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 871),
-    NAME_FUNC_OFFSET(15677, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 872),
-    NAME_FUNC_OFFSET(15699, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 873),
-    NAME_FUNC_OFFSET(15720, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 874),
-    NAME_FUNC_OFFSET(15746, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 875),
-    NAME_FUNC_OFFSET(15779, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 876),
-    NAME_FUNC_OFFSET(15810, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 877),
-    NAME_FUNC_OFFSET(15831, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
-    NAME_FUNC_OFFSET(15862, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
-    NAME_FUNC_OFFSET(15882, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 880),
-    NAME_FUNC_OFFSET(15910, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 881),
-    NAME_FUNC_OFFSET(15933, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 882),
-    NAME_FUNC_OFFSET(15958, glActiveProgramEXT, glActiveProgramEXT, NULL, 883),
-    NAME_FUNC_OFFSET(15977, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 884),
-    NAME_FUNC_OFFSET(16002, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 885),
-    NAME_FUNC_OFFSET(16024, glTextureBarrierNV, glTextureBarrierNV, NULL, 886),
-    NAME_FUNC_OFFSET(16043, gl_dispatch_stub_887, gl_dispatch_stub_887, NULL, 887),
-    NAME_FUNC_OFFSET(16068, gl_dispatch_stub_888, gl_dispatch_stub_888, NULL, 888),
-    NAME_FUNC_OFFSET(16097, gl_dispatch_stub_889, gl_dispatch_stub_889, NULL, 889),
-    NAME_FUNC_OFFSET(16128, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
-    NAME_FUNC_OFFSET(16152, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
-    NAME_FUNC_OFFSET(16177, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 892),
-    NAME_FUNC_OFFSET(16216, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 893),
-    NAME_FUNC_OFFSET(16245, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(16263, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(16280, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(16296, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(16321, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(16341, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(16361, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(16384, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(16407, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(16427, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(16444, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(16461, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(16476, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(16500, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(16519, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(16538, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(16554, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(16573, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(16596, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(16612, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(16628, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(16655, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(16682, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(16702, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(16721, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(16740, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(16770, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(16800, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(16830, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(16860, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(16879, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(16902, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(16927, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(16952, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(16979, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(17007, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(17034, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(17062, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(17091, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(17120, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(17146, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(17177, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(17208, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(17232, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(17255, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(17273, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(17302, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(17331, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(17346, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(17372, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(17398, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(17413, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(17425, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(17445, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(17462, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(17478, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(17497, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(17520, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(17536, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
-    NAME_FUNC_OFFSET(17558, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
-    NAME_FUNC_OFFSET(17576, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
-    NAME_FUNC_OFFSET(17595, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(17613, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(17632, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
-    NAME_FUNC_OFFSET(17650, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
-    NAME_FUNC_OFFSET(17669, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
-    NAME_FUNC_OFFSET(17687, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
-    NAME_FUNC_OFFSET(17706, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
-    NAME_FUNC_OFFSET(17724, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
-    NAME_FUNC_OFFSET(17743, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(17761, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(17780, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
-    NAME_FUNC_OFFSET(17798, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
-    NAME_FUNC_OFFSET(17817, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
-    NAME_FUNC_OFFSET(17835, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
-    NAME_FUNC_OFFSET(17854, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
-    NAME_FUNC_OFFSET(17872, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
-    NAME_FUNC_OFFSET(17891, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(17909, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(17928, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
-    NAME_FUNC_OFFSET(17946, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
-    NAME_FUNC_OFFSET(17965, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
-    NAME_FUNC_OFFSET(17983, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
-    NAME_FUNC_OFFSET(18002, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
-    NAME_FUNC_OFFSET(18020, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
-    NAME_FUNC_OFFSET(18039, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(18057, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(18076, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
-    NAME_FUNC_OFFSET(18094, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
-    NAME_FUNC_OFFSET(18113, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
-    NAME_FUNC_OFFSET(18131, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
-    NAME_FUNC_OFFSET(18150, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(18173, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(18196, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(18219, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(18242, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(18265, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(18282, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(18305, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(18328, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(18351, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(18377, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(18403, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(18429, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(18453, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(18480, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(18506, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
-    NAME_FUNC_OFFSET(18526, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
-    NAME_FUNC_OFFSET(18546, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
-    NAME_FUNC_OFFSET(18566, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(18589, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(18613, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(18636, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(18660, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(18677, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
-    NAME_FUNC_OFFSET(18695, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(18712, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
-    NAME_FUNC_OFFSET(18730, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(18747, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
-    NAME_FUNC_OFFSET(18765, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(18782, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
-    NAME_FUNC_OFFSET(18800, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(18817, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
-    NAME_FUNC_OFFSET(18835, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(18852, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
-    NAME_FUNC_OFFSET(18870, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(18887, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
-    NAME_FUNC_OFFSET(18905, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(18922, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
-    NAME_FUNC_OFFSET(18940, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(18957, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
-    NAME_FUNC_OFFSET(18975, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
-    NAME_FUNC_OFFSET(18994, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
-    NAME_FUNC_OFFSET(19013, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
-    NAME_FUNC_OFFSET(19032, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
-    NAME_FUNC_OFFSET(19051, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
-    NAME_FUNC_OFFSET(19071, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
-    NAME_FUNC_OFFSET(19091, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
-    NAME_FUNC_OFFSET(19111, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
-    NAME_FUNC_OFFSET(19129, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(19146, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
-    NAME_FUNC_OFFSET(19164, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(19181, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
-    NAME_FUNC_OFFSET(19199, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
-    NAME_FUNC_OFFSET(19217, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(19234, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
-    NAME_FUNC_OFFSET(19252, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
-    NAME_FUNC_OFFSET(19271, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
-    NAME_FUNC_OFFSET(19290, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
-    NAME_FUNC_OFFSET(19309, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
-    NAME_FUNC_OFFSET(19331, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(19344, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(19357, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(19373, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(19389, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(19402, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(19425, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
-    NAME_FUNC_OFFSET(19445, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
-    NAME_FUNC_OFFSET(19464, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(19475, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(19487, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(19501, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(19514, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(19530, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(19541, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(19554, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
-    NAME_FUNC_OFFSET(19573, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
-    NAME_FUNC_OFFSET(19593, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(19606, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(19616, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(19632, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
-    NAME_FUNC_OFFSET(19651, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
-    NAME_FUNC_OFFSET(19669, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
-    NAME_FUNC_OFFSET(19690, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(19705, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(19720, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(19734, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(19749, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(19761, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(19774, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(19786, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(19799, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(19811, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(19824, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(19836, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(19849, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(19861, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(19874, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(19886, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(19899, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(19911, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(19924, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(19936, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(19949, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
-    NAME_FUNC_OFFSET(19968, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
-    NAME_FUNC_OFFSET(19987, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
-    NAME_FUNC_OFFSET(20006, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
-    NAME_FUNC_OFFSET(20019, glValidateProgramARB, glValidateProgramARB, NULL, 567),
-    NAME_FUNC_OFFSET(20037, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
-    NAME_FUNC_OFFSET(20058, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
-    NAME_FUNC_OFFSET(20076, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
-    NAME_FUNC_OFFSET(20096, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(20110, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(20127, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(20152, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(20174, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(20201, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(20225, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(20261, gl_dispatch_stub_619, gl_dispatch_stub_619, NULL, 619),
-    NAME_FUNC_OFFSET(20277, gl_dispatch_stub_620, gl_dispatch_stub_620, NULL, 620),
-    NAME_FUNC_OFFSET(20296, glPointParameterfEXT, glPointParameterfEXT, NULL, 627),
-    NAME_FUNC_OFFSET(20314, glPointParameterfEXT, glPointParameterfEXT, NULL, 627),
-    NAME_FUNC_OFFSET(20335, glPointParameterfEXT, glPointParameterfEXT, NULL, 627),
-    NAME_FUNC_OFFSET(20357, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 628),
-    NAME_FUNC_OFFSET(20376, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 628),
-    NAME_FUNC_OFFSET(20398, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 628),
-    NAME_FUNC_OFFSET(20421, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 631),
-    NAME_FUNC_OFFSET(20440, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 632),
-    NAME_FUNC_OFFSET(20460, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 633),
-    NAME_FUNC_OFFSET(20479, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 634),
-    NAME_FUNC_OFFSET(20499, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 635),
-    NAME_FUNC_OFFSET(20518, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 636),
-    NAME_FUNC_OFFSET(20538, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 637),
-    NAME_FUNC_OFFSET(20557, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 638),
-    NAME_FUNC_OFFSET(20577, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 639),
-    NAME_FUNC_OFFSET(20596, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 640),
-    NAME_FUNC_OFFSET(20616, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 641),
-    NAME_FUNC_OFFSET(20636, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 642),
-    NAME_FUNC_OFFSET(20657, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 643),
-    NAME_FUNC_OFFSET(20677, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 644),
-    NAME_FUNC_OFFSET(20698, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 645),
-    NAME_FUNC_OFFSET(20718, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 646),
-    NAME_FUNC_OFFSET(20739, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 647),
-    NAME_FUNC_OFFSET(20763, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 648),
-    NAME_FUNC_OFFSET(20781, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 649),
-    NAME_FUNC_OFFSET(20801, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 650),
-    NAME_FUNC_OFFSET(20819, glFogCoorddEXT, glFogCoorddEXT, NULL, 651),
-    NAME_FUNC_OFFSET(20831, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 652),
-    NAME_FUNC_OFFSET(20844, glFogCoordfEXT, glFogCoordfEXT, NULL, 653),
-    NAME_FUNC_OFFSET(20856, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 654),
-    NAME_FUNC_OFFSET(20869, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 656),
-    NAME_FUNC_OFFSET(20889, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 656),
-    NAME_FUNC_OFFSET(20913, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 673),
-    NAME_FUNC_OFFSET(20927, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 673),
-    NAME_FUNC_OFFSET(20944, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 674),
-    NAME_FUNC_OFFSET(20959, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 674),
-    NAME_FUNC_OFFSET(20977, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 675),
-    NAME_FUNC_OFFSET(20991, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 675),
-    NAME_FUNC_OFFSET(21008, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 676),
-    NAME_FUNC_OFFSET(21023, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 676),
-    NAME_FUNC_OFFSET(21041, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 677),
-    NAME_FUNC_OFFSET(21055, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 677),
-    NAME_FUNC_OFFSET(21072, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 678),
-    NAME_FUNC_OFFSET(21087, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 678),
-    NAME_FUNC_OFFSET(21105, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 679),
-    NAME_FUNC_OFFSET(21119, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 679),
-    NAME_FUNC_OFFSET(21136, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 680),
-    NAME_FUNC_OFFSET(21151, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 680),
-    NAME_FUNC_OFFSET(21169, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 681),
-    NAME_FUNC_OFFSET(21183, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 681),
-    NAME_FUNC_OFFSET(21200, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 682),
-    NAME_FUNC_OFFSET(21215, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 682),
-    NAME_FUNC_OFFSET(21233, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 683),
-    NAME_FUNC_OFFSET(21247, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 683),
-    NAME_FUNC_OFFSET(21264, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 684),
-    NAME_FUNC_OFFSET(21279, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 684),
-    NAME_FUNC_OFFSET(21297, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 685),
-    NAME_FUNC_OFFSET(21311, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 685),
-    NAME_FUNC_OFFSET(21328, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 686),
-    NAME_FUNC_OFFSET(21343, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 686),
-    NAME_FUNC_OFFSET(21361, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 687),
-    NAME_FUNC_OFFSET(21375, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 687),
-    NAME_FUNC_OFFSET(21392, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 688),
-    NAME_FUNC_OFFSET(21407, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 688),
-    NAME_FUNC_OFFSET(21425, glBindProgramNV, glBindProgramNV, NULL, 707),
-    NAME_FUNC_OFFSET(21442, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 708),
-    NAME_FUNC_OFFSET(21462, glGenProgramsNV, glGenProgramsNV, NULL, 710),
-    NAME_FUNC_OFFSET(21479, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 716),
-    NAME_FUNC_OFFSET(21505, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 716),
-    NAME_FUNC_OFFSET(21534, glIsProgramNV, glIsProgramNV, NULL, 720),
-    NAME_FUNC_OFFSET(21549, glPointParameteriNV, glPointParameteriNV, NULL, 784),
-    NAME_FUNC_OFFSET(21567, glPointParameterivNV, glPointParameterivNV, NULL, 785),
-    NAME_FUNC_OFFSET(21586, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
-    NAME_FUNC_OFFSET(21607, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, 790),
-    NAME_FUNC_OFFSET(21623, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 797),
-    NAME_FUNC_OFFSET(21647, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, 800),
-    NAME_FUNC_OFFSET(21671, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, 800),
-    NAME_FUNC_OFFSET(21698, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 801),
-    NAME_FUNC_OFFSET(21716, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 802),
-    NAME_FUNC_OFFSET(21735, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 803),
-    NAME_FUNC_OFFSET(21760, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 804),
-    NAME_FUNC_OFFSET(21781, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 805),
-    NAME_FUNC_OFFSET(21803, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 806),
-    NAME_FUNC_OFFSET(21829, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 807),
-    NAME_FUNC_OFFSET(21852, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 808),
-    NAME_FUNC_OFFSET(21875, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 809),
-    NAME_FUNC_OFFSET(21898, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 810),
-    NAME_FUNC_OFFSET(21916, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 811),
-    NAME_FUNC_OFFSET(21935, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 812),
-    NAME_FUNC_OFFSET(21952, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 813),
-    NAME_FUNC_OFFSET(21990, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 814),
-    NAME_FUNC_OFFSET(22019, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 815),
-    NAME_FUNC_OFFSET(22035, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 816),
-    NAME_FUNC_OFFSET(22052, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 817),
-    NAME_FUNC_OFFSET(22074, gl_dispatch_stub_818, gl_dispatch_stub_818, NULL, 818),
-    NAME_FUNC_OFFSET(22092, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 821),
-    NAME_FUNC_OFFSET(22115, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 822),
-    NAME_FUNC_OFFSET(22137, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 823),
-    NAME_FUNC_OFFSET(22153, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 824),
-    NAME_FUNC_OFFSET(22174, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 825),
-    NAME_FUNC_OFFSET(22196, glUniform1uiEXT, glUniform1uiEXT, NULL, 826),
-    NAME_FUNC_OFFSET(22209, glUniform1uivEXT, glUniform1uivEXT, NULL, 827),
-    NAME_FUNC_OFFSET(22223, glUniform2uiEXT, glUniform2uiEXT, NULL, 828),
-    NAME_FUNC_OFFSET(22236, glUniform2uivEXT, glUniform2uivEXT, NULL, 829),
-    NAME_FUNC_OFFSET(22250, glUniform3uiEXT, glUniform3uiEXT, NULL, 830),
-    NAME_FUNC_OFFSET(22263, glUniform3uivEXT, glUniform3uivEXT, NULL, 831),
-    NAME_FUNC_OFFSET(22277, glUniform4uiEXT, glUniform4uiEXT, NULL, 832),
-    NAME_FUNC_OFFSET(22290, glUniform4uivEXT, glUniform4uivEXT, NULL, 833),
-    NAME_FUNC_OFFSET(22304, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 834),
-    NAME_FUNC_OFFSET(22322, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 835),
-    NAME_FUNC_OFFSET(22341, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 836),
-    NAME_FUNC_OFFSET(22360, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 837),
-    NAME_FUNC_OFFSET(22380, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 838),
-    NAME_FUNC_OFFSET(22398, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 839),
-    NAME_FUNC_OFFSET(22417, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 840),
-    NAME_FUNC_OFFSET(22436, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 841),
-    NAME_FUNC_OFFSET(22456, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 842),
-    NAME_FUNC_OFFSET(22474, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 843),
-    NAME_FUNC_OFFSET(22493, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 844),
-    NAME_FUNC_OFFSET(22512, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 845),
-    NAME_FUNC_OFFSET(22532, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 846),
-    NAME_FUNC_OFFSET(22551, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 847),
-    NAME_FUNC_OFFSET(22569, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 848),
-    NAME_FUNC_OFFSET(22588, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 849),
-    NAME_FUNC_OFFSET(22607, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 850),
-    NAME_FUNC_OFFSET(22627, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 851),
-    NAME_FUNC_OFFSET(22646, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 852),
-    NAME_FUNC_OFFSET(22666, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 853),
-    NAME_FUNC_OFFSET(22686, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 854),
-    NAME_FUNC_OFFSET(22709, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 855),
-    NAME_FUNC_OFFSET(22735, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 856),
-    NAME_FUNC_OFFSET(22748, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 857),
-    NAME_FUNC_OFFSET(22759, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 858),
-    NAME_FUNC_OFFSET(22769, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 859),
-    NAME_FUNC_OFFSET(22785, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 860),
-    NAME_FUNC_OFFSET(22801, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 861),
-    NAME_FUNC_OFFSET(22814, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 864),
-    NAME_FUNC_OFFSET(22835, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 865),
-    NAME_FUNC_OFFSET(22857, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 866),
-    NAME_FUNC_OFFSET(22875, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 867),
-    NAME_FUNC_OFFSET(22894, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 868),
-    NAME_FUNC_OFFSET(22919, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 869),
-    NAME_FUNC_OFFSET(22942, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 870),
-    NAME_FUNC_OFFSET(22967, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 871),
-    NAME_FUNC_OFFSET(22984, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 873),
-    NAME_FUNC_OFFSET(23002, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 874),
-    NAME_FUNC_OFFSET(23025, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 875),
-    NAME_FUNC_OFFSET(23055, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 876),
-    NAME_FUNC_OFFSET(23083, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 877),
+    NAME_FUNC_OFFSET( 9717, glBindSampler, glBindSampler, NULL, 600),
+    NAME_FUNC_OFFSET( 9731, glDeleteSamplers, glDeleteSamplers, NULL, 601),
+    NAME_FUNC_OFFSET( 9748, glGenSamplers, glGenSamplers, NULL, 602),
+    NAME_FUNC_OFFSET( 9762, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 603),
+    NAME_FUNC_OFFSET( 9787, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 604),
+    NAME_FUNC_OFFSET( 9813, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 605),
+    NAME_FUNC_OFFSET( 9837, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 606),
+    NAME_FUNC_OFFSET( 9861, glIsSampler, glIsSampler, NULL, 607),
+    NAME_FUNC_OFFSET( 9873, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 608),
+    NAME_FUNC_OFFSET( 9895, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 609),
+    NAME_FUNC_OFFSET( 9918, glSamplerParameterf, glSamplerParameterf, NULL, 610),
+    NAME_FUNC_OFFSET( 9938, glSamplerParameterfv, glSamplerParameterfv, NULL, 611),
+    NAME_FUNC_OFFSET( 9959, glSamplerParameteri, glSamplerParameteri, NULL, 612),
+    NAME_FUNC_OFFSET( 9979, glSamplerParameteriv, glSamplerParameteriv, NULL, 613),
+    NAME_FUNC_OFFSET(10000, glBindTransformFeedback, glBindTransformFeedback, NULL, 614),
+    NAME_FUNC_OFFSET(10024, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 615),
+    NAME_FUNC_OFFSET(10051, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 616),
+    NAME_FUNC_OFFSET(10075, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 617),
+    NAME_FUNC_OFFSET(10099, glIsTransformFeedback, glIsTransformFeedback, NULL, 618),
+    NAME_FUNC_OFFSET(10121, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 619),
+    NAME_FUNC_OFFSET(10146, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 620),
+    NAME_FUNC_OFFSET(10172, glClearDepthf, glClearDepthf, NULL, 621),
+    NAME_FUNC_OFFSET(10186, glDepthRangef, glDepthRangef, NULL, 622),
+    NAME_FUNC_OFFSET(10200, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 623),
+    NAME_FUNC_OFFSET(10227, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 624),
+    NAME_FUNC_OFFSET(10251, glShaderBinary, glShaderBinary, NULL, 625),
+    NAME_FUNC_OFFSET(10266, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 626),
+    NAME_FUNC_OFFSET(10285, gl_dispatch_stub_627, gl_dispatch_stub_627, NULL, 627),
+    NAME_FUNC_OFFSET(10317, gl_dispatch_stub_628, gl_dispatch_stub_628, NULL, 628),
+    NAME_FUNC_OFFSET(10349, gl_dispatch_stub_629, gl_dispatch_stub_629, NULL, 629),
+    NAME_FUNC_OFFSET(10377, gl_dispatch_stub_630, gl_dispatch_stub_630, NULL, 630),
+    NAME_FUNC_OFFSET(10406, gl_dispatch_stub_631, gl_dispatch_stub_631, NULL, 631),
+    NAME_FUNC_OFFSET(10434, gl_dispatch_stub_632, gl_dispatch_stub_632, NULL, 632),
+    NAME_FUNC_OFFSET(10463, gl_dispatch_stub_633, gl_dispatch_stub_633, NULL, 633),
+    NAME_FUNC_OFFSET(10480, gl_dispatch_stub_634, gl_dispatch_stub_634, NULL, 634),
+    NAME_FUNC_OFFSET(10500, glColorPointerEXT, glColorPointerEXT, NULL, 635),
+    NAME_FUNC_OFFSET(10518, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 636),
+    NAME_FUNC_OFFSET(10539, glIndexPointerEXT, glIndexPointerEXT, NULL, 637),
+    NAME_FUNC_OFFSET(10557, glNormalPointerEXT, glNormalPointerEXT, NULL, 638),
+    NAME_FUNC_OFFSET(10576, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 639),
+    NAME_FUNC_OFFSET(10597, glVertexPointerEXT, glVertexPointerEXT, NULL, 640),
+    NAME_FUNC_OFFSET(10616, glPointParameterfEXT, glPointParameterfEXT, NULL, 641),
+    NAME_FUNC_OFFSET(10637, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 642),
+    NAME_FUNC_OFFSET(10659, glLockArraysEXT, glLockArraysEXT, NULL, 643),
+    NAME_FUNC_OFFSET(10675, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 644),
+    NAME_FUNC_OFFSET(10693, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 645),
+    NAME_FUNC_OFFSET(10715, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 646),
+    NAME_FUNC_OFFSET(10738, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 647),
+    NAME_FUNC_OFFSET(10760, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 648),
+    NAME_FUNC_OFFSET(10783, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 649),
+    NAME_FUNC_OFFSET(10805, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 650),
+    NAME_FUNC_OFFSET(10828, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 651),
+    NAME_FUNC_OFFSET(10850, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 652),
+    NAME_FUNC_OFFSET(10873, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 653),
+    NAME_FUNC_OFFSET(10895, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 654),
+    NAME_FUNC_OFFSET(10918, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 655),
+    NAME_FUNC_OFFSET(10941, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 656),
+    NAME_FUNC_OFFSET(10965, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 657),
+    NAME_FUNC_OFFSET(10988, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 658),
+    NAME_FUNC_OFFSET(11012, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 659),
+    NAME_FUNC_OFFSET(11035, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 660),
+    NAME_FUNC_OFFSET(11059, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 661),
+    NAME_FUNC_OFFSET(11086, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 662),
+    NAME_FUNC_OFFSET(11107, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 663),
+    NAME_FUNC_OFFSET(11130, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 664),
+    NAME_FUNC_OFFSET(11151, glFogCoorddEXT, glFogCoorddEXT, NULL, 665),
+    NAME_FUNC_OFFSET(11166, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 666),
+    NAME_FUNC_OFFSET(11182, glFogCoordfEXT, glFogCoordfEXT, NULL, 667),
+    NAME_FUNC_OFFSET(11197, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 668),
+    NAME_FUNC_OFFSET(11213, gl_dispatch_stub_669, gl_dispatch_stub_669, NULL, 669),
+    NAME_FUNC_OFFSET(11231, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 670),
+    NAME_FUNC_OFFSET(11254, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 671),
+    NAME_FUNC_OFFSET(11280, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 672),
+    NAME_FUNC_OFFSET(11301, glCombinerInputNV, glCombinerInputNV, NULL, 673),
+    NAME_FUNC_OFFSET(11319, glCombinerOutputNV, glCombinerOutputNV, NULL, 674),
+    NAME_FUNC_OFFSET(11338, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 675),
+    NAME_FUNC_OFFSET(11361, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 676),
+    NAME_FUNC_OFFSET(11385, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 677),
+    NAME_FUNC_OFFSET(11408, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 678),
+    NAME_FUNC_OFFSET(11432, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 679),
+    NAME_FUNC_OFFSET(11455, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 680),
+    NAME_FUNC_OFFSET(11487, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 681),
+    NAME_FUNC_OFFSET(11519, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 682),
+    NAME_FUNC_OFFSET(11552, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 683),
+    NAME_FUNC_OFFSET(11585, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 684),
+    NAME_FUNC_OFFSET(11622, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 685),
+    NAME_FUNC_OFFSET(11659, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 686),
+    NAME_FUNC_OFFSET(11679, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 687),
+    NAME_FUNC_OFFSET(11697, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 688),
+    NAME_FUNC_OFFSET(11716, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 689),
+    NAME_FUNC_OFFSET(11734, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 690),
+    NAME_FUNC_OFFSET(11753, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 691),
+    NAME_FUNC_OFFSET(11771, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 692),
+    NAME_FUNC_OFFSET(11790, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 693),
+    NAME_FUNC_OFFSET(11808, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 694),
+    NAME_FUNC_OFFSET(11827, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 695),
+    NAME_FUNC_OFFSET(11845, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 696),
+    NAME_FUNC_OFFSET(11864, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 697),
+    NAME_FUNC_OFFSET(11882, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 698),
+    NAME_FUNC_OFFSET(11901, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 699),
+    NAME_FUNC_OFFSET(11919, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 700),
+    NAME_FUNC_OFFSET(11938, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 701),
+    NAME_FUNC_OFFSET(11956, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 702),
+    NAME_FUNC_OFFSET(11975, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 703),
+    NAME_FUNC_OFFSET(11993, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 704),
+    NAME_FUNC_OFFSET(12012, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 705),
+    NAME_FUNC_OFFSET(12030, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 706),
+    NAME_FUNC_OFFSET(12049, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 707),
+    NAME_FUNC_OFFSET(12067, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 708),
+    NAME_FUNC_OFFSET(12086, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 709),
+    NAME_FUNC_OFFSET(12104, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 710),
+    NAME_FUNC_OFFSET(12123, gl_dispatch_stub_711, gl_dispatch_stub_711, NULL, 711),
+    NAME_FUNC_OFFSET(12148, gl_dispatch_stub_712, gl_dispatch_stub_712, NULL, 712),
+    NAME_FUNC_OFFSET(12175, gl_dispatch_stub_713, gl_dispatch_stub_713, NULL, 713),
+    NAME_FUNC_OFFSET(12192, gl_dispatch_stub_714, gl_dispatch_stub_714, NULL, 714),
+    NAME_FUNC_OFFSET(12208, gl_dispatch_stub_715, gl_dispatch_stub_715, NULL, 715),
+    NAME_FUNC_OFFSET(12222, gl_dispatch_stub_716, gl_dispatch_stub_716, NULL, 716),
+    NAME_FUNC_OFFSET(12237, gl_dispatch_stub_717, gl_dispatch_stub_717, NULL, 717),
+    NAME_FUNC_OFFSET(12249, gl_dispatch_stub_718, gl_dispatch_stub_718, NULL, 718),
+    NAME_FUNC_OFFSET(12262, gl_dispatch_stub_719, gl_dispatch_stub_719, NULL, 719),
+    NAME_FUNC_OFFSET(12276, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 720),
+    NAME_FUNC_OFFSET(12300, glBindProgramNV, glBindProgramNV, NULL, 721),
+    NAME_FUNC_OFFSET(12316, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 722),
+    NAME_FUNC_OFFSET(12335, glExecuteProgramNV, glExecuteProgramNV, NULL, 723),
+    NAME_FUNC_OFFSET(12354, glGenProgramsNV, glGenProgramsNV, NULL, 724),
+    NAME_FUNC_OFFSET(12370, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 725),
+    NAME_FUNC_OFFSET(12396, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 726),
+    NAME_FUNC_OFFSET(12422, glGetProgramStringNV, glGetProgramStringNV, NULL, 727),
+    NAME_FUNC_OFFSET(12443, glGetProgramivNV, glGetProgramivNV, NULL, 728),
+    NAME_FUNC_OFFSET(12460, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 729),
+    NAME_FUNC_OFFSET(12481, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 730),
+    NAME_FUNC_OFFSET(12509, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 731),
+    NAME_FUNC_OFFSET(12531, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 732),
+    NAME_FUNC_OFFSET(12553, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 733),
+    NAME_FUNC_OFFSET(12575, glIsProgramNV, glIsProgramNV, NULL, 734),
+    NAME_FUNC_OFFSET(12589, glLoadProgramNV, glLoadProgramNV, NULL, 735),
+    NAME_FUNC_OFFSET(12605, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 736),
+    NAME_FUNC_OFFSET(12630, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 737),
+    NAME_FUNC_OFFSET(12655, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 738),
+    NAME_FUNC_OFFSET(12683, glTrackMatrixNV, glTrackMatrixNV, NULL, 739),
+    NAME_FUNC_OFFSET(12699, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 740),
+    NAME_FUNC_OFFSET(12718, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 741),
+    NAME_FUNC_OFFSET(12738, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 742),
+    NAME_FUNC_OFFSET(12757, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 743),
+    NAME_FUNC_OFFSET(12777, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 744),
+    NAME_FUNC_OFFSET(12796, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 745),
+    NAME_FUNC_OFFSET(12816, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 746),
+    NAME_FUNC_OFFSET(12835, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 747),
+    NAME_FUNC_OFFSET(12855, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 748),
+    NAME_FUNC_OFFSET(12874, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 749),
+    NAME_FUNC_OFFSET(12894, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 750),
+    NAME_FUNC_OFFSET(12913, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 751),
+    NAME_FUNC_OFFSET(12933, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 752),
+    NAME_FUNC_OFFSET(12952, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 753),
+    NAME_FUNC_OFFSET(12972, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 754),
+    NAME_FUNC_OFFSET(12991, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 755),
+    NAME_FUNC_OFFSET(13011, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 756),
+    NAME_FUNC_OFFSET(13030, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 757),
+    NAME_FUNC_OFFSET(13050, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 758),
+    NAME_FUNC_OFFSET(13069, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 759),
+    NAME_FUNC_OFFSET(13089, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 760),
+    NAME_FUNC_OFFSET(13108, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 761),
+    NAME_FUNC_OFFSET(13128, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 762),
+    NAME_FUNC_OFFSET(13147, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 763),
+    NAME_FUNC_OFFSET(13167, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 764),
+    NAME_FUNC_OFFSET(13187, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 765),
+    NAME_FUNC_OFFSET(13208, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 766),
+    NAME_FUNC_OFFSET(13232, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 767),
+    NAME_FUNC_OFFSET(13253, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 768),
+    NAME_FUNC_OFFSET(13274, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 769),
+    NAME_FUNC_OFFSET(13295, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 770),
+    NAME_FUNC_OFFSET(13316, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 771),
+    NAME_FUNC_OFFSET(13337, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 772),
+    NAME_FUNC_OFFSET(13358, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 773),
+    NAME_FUNC_OFFSET(13379, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 774),
+    NAME_FUNC_OFFSET(13400, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 775),
+    NAME_FUNC_OFFSET(13421, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 776),
+    NAME_FUNC_OFFSET(13442, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 777),
+    NAME_FUNC_OFFSET(13463, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 778),
+    NAME_FUNC_OFFSET(13484, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 779),
+    NAME_FUNC_OFFSET(13506, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 780),
+    NAME_FUNC_OFFSET(13533, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 781),
+    NAME_FUNC_OFFSET(13560, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 782),
+    NAME_FUNC_OFFSET(13584, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 783),
+    NAME_FUNC_OFFSET(13608, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 784),
+    NAME_FUNC_OFFSET(13630, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 785),
+    NAME_FUNC_OFFSET(13652, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 786),
+    NAME_FUNC_OFFSET(13674, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 787),
+    NAME_FUNC_OFFSET(13699, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 788),
+    NAME_FUNC_OFFSET(13723, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 789),
+    NAME_FUNC_OFFSET(13745, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 790),
+    NAME_FUNC_OFFSET(13767, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 791),
+    NAME_FUNC_OFFSET(13789, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 792),
+    NAME_FUNC_OFFSET(13815, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 793),
+    NAME_FUNC_OFFSET(13838, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 794),
+    NAME_FUNC_OFFSET(13862, glPassTexCoordATI, glPassTexCoordATI, NULL, 795),
+    NAME_FUNC_OFFSET(13880, glSampleMapATI, glSampleMapATI, NULL, 796),
+    NAME_FUNC_OFFSET(13895, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 797),
+    NAME_FUNC_OFFSET(13926, glPointParameteriNV, glPointParameteriNV, NULL, 798),
+    NAME_FUNC_OFFSET(13946, glPointParameterivNV, glPointParameterivNV, NULL, 799),
+    NAME_FUNC_OFFSET(13967, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, 800),
+    NAME_FUNC_OFFSET(13990, gl_dispatch_stub_801, gl_dispatch_stub_801, NULL, 801),
+    NAME_FUNC_OFFSET(14013, gl_dispatch_stub_802, gl_dispatch_stub_802, NULL, 802),
+    NAME_FUNC_OFFSET(14039, gl_dispatch_stub_803, gl_dispatch_stub_803, NULL, 803),
+    NAME_FUNC_OFFSET(14062, gl_dispatch_stub_804, gl_dispatch_stub_804, NULL, 804),
+    NAME_FUNC_OFFSET(14083, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 805),
+    NAME_FUNC_OFFSET(14114, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 806),
+    NAME_FUNC_OFFSET(14145, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 807),
+    NAME_FUNC_OFFSET(14173, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 808),
+    NAME_FUNC_OFFSET(14202, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 809),
+    NAME_FUNC_OFFSET(14230, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 810),
+    NAME_FUNC_OFFSET(14259, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 811),
+    NAME_FUNC_OFFSET(14285, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 812),
+    NAME_FUNC_OFFSET(14306, gl_dispatch_stub_813, gl_dispatch_stub_813, NULL, 813),
+    NAME_FUNC_OFFSET(14323, gl_dispatch_stub_814, gl_dispatch_stub_814, NULL, 814),
+    NAME_FUNC_OFFSET(14350, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 815),
+    NAME_FUNC_OFFSET(14371, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 816),
+    NAME_FUNC_OFFSET(14393, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 817),
+    NAME_FUNC_OFFSET(14421, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 818),
+    NAME_FUNC_OFFSET(14445, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 819),
+    NAME_FUNC_OFFSET(14470, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 820),
+    NAME_FUNC_OFFSET(14499, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 821),
+    NAME_FUNC_OFFSET(14525, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 822),
+    NAME_FUNC_OFFSET(14551, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 823),
+    NAME_FUNC_OFFSET(14577, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 824),
+    NAME_FUNC_OFFSET(14598, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 825),
+    NAME_FUNC_OFFSET(14620, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 826),
+    NAME_FUNC_OFFSET(14640, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 827),
+    NAME_FUNC_OFFSET(14681, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 828),
+    NAME_FUNC_OFFSET(14713, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 829),
+    NAME_FUNC_OFFSET(14732, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 830),
+    NAME_FUNC_OFFSET(14752, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 831),
+    NAME_FUNC_OFFSET(14777, gl_dispatch_stub_832, gl_dispatch_stub_832, NULL, 832),
+    NAME_FUNC_OFFSET(14798, gl_dispatch_stub_833, gl_dispatch_stub_833, NULL, 833),
+    NAME_FUNC_OFFSET(14822, gl_dispatch_stub_834, gl_dispatch_stub_834, NULL, 834),
+    NAME_FUNC_OFFSET(14852, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 835),
+    NAME_FUNC_OFFSET(14878, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 836),
+    NAME_FUNC_OFFSET(14903, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 837),
+    NAME_FUNC_OFFSET(14922, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 838),
+    NAME_FUNC_OFFSET(14946, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 839),
+    NAME_FUNC_OFFSET(14971, glUniform1uiEXT, glUniform1uiEXT, NULL, 840),
+    NAME_FUNC_OFFSET(14987, glUniform1uivEXT, glUniform1uivEXT, NULL, 841),
+    NAME_FUNC_OFFSET(15004, glUniform2uiEXT, glUniform2uiEXT, NULL, 842),
+    NAME_FUNC_OFFSET(15020, glUniform2uivEXT, glUniform2uivEXT, NULL, 843),
+    NAME_FUNC_OFFSET(15037, glUniform3uiEXT, glUniform3uiEXT, NULL, 844),
+    NAME_FUNC_OFFSET(15053, glUniform3uivEXT, glUniform3uivEXT, NULL, 845),
+    NAME_FUNC_OFFSET(15070, glUniform4uiEXT, glUniform4uiEXT, NULL, 846),
+    NAME_FUNC_OFFSET(15086, glUniform4uivEXT, glUniform4uivEXT, NULL, 847),
+    NAME_FUNC_OFFSET(15103, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 848),
+    NAME_FUNC_OFFSET(15124, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 849),
+    NAME_FUNC_OFFSET(15146, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 850),
+    NAME_FUNC_OFFSET(15168, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 851),
+    NAME_FUNC_OFFSET(15191, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 852),
+    NAME_FUNC_OFFSET(15212, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 853),
+    NAME_FUNC_OFFSET(15234, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 854),
+    NAME_FUNC_OFFSET(15256, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 855),
+    NAME_FUNC_OFFSET(15279, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 856),
+    NAME_FUNC_OFFSET(15300, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 857),
+    NAME_FUNC_OFFSET(15322, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 858),
+    NAME_FUNC_OFFSET(15344, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 859),
+    NAME_FUNC_OFFSET(15367, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 860),
+    NAME_FUNC_OFFSET(15389, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 861),
+    NAME_FUNC_OFFSET(15410, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 862),
+    NAME_FUNC_OFFSET(15432, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 863),
+    NAME_FUNC_OFFSET(15454, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 864),
+    NAME_FUNC_OFFSET(15477, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 865),
+    NAME_FUNC_OFFSET(15499, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 866),
+    NAME_FUNC_OFFSET(15522, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 867),
+    NAME_FUNC_OFFSET(15545, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 868),
+    NAME_FUNC_OFFSET(15571, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 869),
+    NAME_FUNC_OFFSET(15600, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 870),
+    NAME_FUNC_OFFSET(15622, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 871),
+    NAME_FUNC_OFFSET(15642, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 872),
+    NAME_FUNC_OFFSET(15661, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 873),
+    NAME_FUNC_OFFSET(15685, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 874),
+    NAME_FUNC_OFFSET(15709, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 875),
+    NAME_FUNC_OFFSET(15731, glClearColorIiEXT, glClearColorIiEXT, NULL, 876),
+    NAME_FUNC_OFFSET(15749, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 877),
+    NAME_FUNC_OFFSET(15768, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 878),
+    NAME_FUNC_OFFSET(15792, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 879),
+    NAME_FUNC_OFFSET(15817, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 880),
+    NAME_FUNC_OFFSET(15838, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 881),
+    NAME_FUNC_OFFSET(15860, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 882),
+    NAME_FUNC_OFFSET(15887, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 883),
+    NAME_FUNC_OFFSET(15912, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 884),
+    NAME_FUNC_OFFSET(15940, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 885),
+    NAME_FUNC_OFFSET(15960, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 886),
+    NAME_FUNC_OFFSET(15982, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 887),
+    NAME_FUNC_OFFSET(16003, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 888),
+    NAME_FUNC_OFFSET(16029, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 889),
+    NAME_FUNC_OFFSET(16062, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 890),
+    NAME_FUNC_OFFSET(16093, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 891),
+    NAME_FUNC_OFFSET(16114, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
+    NAME_FUNC_OFFSET(16145, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
+    NAME_FUNC_OFFSET(16165, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 894),
+    NAME_FUNC_OFFSET(16193, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 895),
+    NAME_FUNC_OFFSET(16216, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 896),
+    NAME_FUNC_OFFSET(16241, glActiveProgramEXT, glActiveProgramEXT, NULL, 897),
+    NAME_FUNC_OFFSET(16260, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 898),
+    NAME_FUNC_OFFSET(16285, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 899),
+    NAME_FUNC_OFFSET(16307, glTextureBarrierNV, glTextureBarrierNV, NULL, 900),
+    NAME_FUNC_OFFSET(16326, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+    NAME_FUNC_OFFSET(16351, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+    NAME_FUNC_OFFSET(16380, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+    NAME_FUNC_OFFSET(16411, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+    NAME_FUNC_OFFSET(16435, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+    NAME_FUNC_OFFSET(16460, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 906),
+    NAME_FUNC_OFFSET(16499, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 907),
+    NAME_FUNC_OFFSET(16528, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(16546, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(16563, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(16579, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(16604, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(16624, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(16644, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(16667, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(16690, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(16710, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(16727, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(16744, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(16759, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(16783, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(16802, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(16821, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(16837, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(16856, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(16879, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(16895, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(16911, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(16938, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(16965, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(16985, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(17004, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(17023, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(17053, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(17083, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(17113, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(17143, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(17162, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(17185, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(17210, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(17235, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(17262, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(17290, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(17317, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(17345, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(17374, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(17403, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(17429, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(17460, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(17491, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(17515, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(17538, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(17556, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(17585, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(17614, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(17629, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(17655, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(17681, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(17696, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(17708, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(17728, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(17745, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(17761, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(17780, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(17803, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+    NAME_FUNC_OFFSET(17819, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+    NAME_FUNC_OFFSET(17841, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+    NAME_FUNC_OFFSET(17859, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+    NAME_FUNC_OFFSET(17878, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(17896, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(17915, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+    NAME_FUNC_OFFSET(17933, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+    NAME_FUNC_OFFSET(17952, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+    NAME_FUNC_OFFSET(17970, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+    NAME_FUNC_OFFSET(17989, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+    NAME_FUNC_OFFSET(18007, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+    NAME_FUNC_OFFSET(18026, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(18044, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(18063, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+    NAME_FUNC_OFFSET(18081, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+    NAME_FUNC_OFFSET(18100, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+    NAME_FUNC_OFFSET(18118, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+    NAME_FUNC_OFFSET(18137, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+    NAME_FUNC_OFFSET(18155, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+    NAME_FUNC_OFFSET(18174, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(18192, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(18211, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+    NAME_FUNC_OFFSET(18229, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+    NAME_FUNC_OFFSET(18248, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+    NAME_FUNC_OFFSET(18266, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+    NAME_FUNC_OFFSET(18285, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+    NAME_FUNC_OFFSET(18303, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+    NAME_FUNC_OFFSET(18322, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(18340, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(18359, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+    NAME_FUNC_OFFSET(18377, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+    NAME_FUNC_OFFSET(18396, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+    NAME_FUNC_OFFSET(18414, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+    NAME_FUNC_OFFSET(18433, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+    NAME_FUNC_OFFSET(18456, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
+    NAME_FUNC_OFFSET(18479, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
+    NAME_FUNC_OFFSET(18502, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
+    NAME_FUNC_OFFSET(18525, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
+    NAME_FUNC_OFFSET(18548, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
+    NAME_FUNC_OFFSET(18565, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
+    NAME_FUNC_OFFSET(18588, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
+    NAME_FUNC_OFFSET(18611, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
+    NAME_FUNC_OFFSET(18634, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
+    NAME_FUNC_OFFSET(18660, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
+    NAME_FUNC_OFFSET(18686, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
+    NAME_FUNC_OFFSET(18712, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
+    NAME_FUNC_OFFSET(18736, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
+    NAME_FUNC_OFFSET(18763, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
+    NAME_FUNC_OFFSET(18789, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
+    NAME_FUNC_OFFSET(18809, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
+    NAME_FUNC_OFFSET(18829, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
+    NAME_FUNC_OFFSET(18849, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
+    NAME_FUNC_OFFSET(18872, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
+    NAME_FUNC_OFFSET(18896, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
+    NAME_FUNC_OFFSET(18919, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
+    NAME_FUNC_OFFSET(18943, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
+    NAME_FUNC_OFFSET(18960, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
+    NAME_FUNC_OFFSET(18978, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
+    NAME_FUNC_OFFSET(18995, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
+    NAME_FUNC_OFFSET(19013, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
+    NAME_FUNC_OFFSET(19030, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
+    NAME_FUNC_OFFSET(19048, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
+    NAME_FUNC_OFFSET(19065, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
+    NAME_FUNC_OFFSET(19083, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
+    NAME_FUNC_OFFSET(19100, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
+    NAME_FUNC_OFFSET(19118, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
+    NAME_FUNC_OFFSET(19135, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
+    NAME_FUNC_OFFSET(19153, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
+    NAME_FUNC_OFFSET(19170, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
+    NAME_FUNC_OFFSET(19188, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
+    NAME_FUNC_OFFSET(19205, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
+    NAME_FUNC_OFFSET(19223, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
+    NAME_FUNC_OFFSET(19240, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
+    NAME_FUNC_OFFSET(19258, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
+    NAME_FUNC_OFFSET(19277, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
+    NAME_FUNC_OFFSET(19296, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
+    NAME_FUNC_OFFSET(19315, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
+    NAME_FUNC_OFFSET(19334, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
+    NAME_FUNC_OFFSET(19354, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
+    NAME_FUNC_OFFSET(19374, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
+    NAME_FUNC_OFFSET(19394, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
+    NAME_FUNC_OFFSET(19412, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
+    NAME_FUNC_OFFSET(19429, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
+    NAME_FUNC_OFFSET(19447, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
+    NAME_FUNC_OFFSET(19464, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
+    NAME_FUNC_OFFSET(19482, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
+    NAME_FUNC_OFFSET(19500, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
+    NAME_FUNC_OFFSET(19517, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
+    NAME_FUNC_OFFSET(19535, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
+    NAME_FUNC_OFFSET(19554, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
+    NAME_FUNC_OFFSET(19573, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
+    NAME_FUNC_OFFSET(19592, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
+    NAME_FUNC_OFFSET(19614, glBindBufferARB, glBindBufferARB, NULL, 510),
+    NAME_FUNC_OFFSET(19627, glBufferDataARB, glBufferDataARB, NULL, 511),
+    NAME_FUNC_OFFSET(19640, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
+    NAME_FUNC_OFFSET(19656, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
+    NAME_FUNC_OFFSET(19672, glGenBuffersARB, glGenBuffersARB, NULL, 514),
+    NAME_FUNC_OFFSET(19685, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
+    NAME_FUNC_OFFSET(19708, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
+    NAME_FUNC_OFFSET(19728, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
+    NAME_FUNC_OFFSET(19747, glIsBufferARB, glIsBufferARB, NULL, 518),
+    NAME_FUNC_OFFSET(19758, glMapBufferARB, glMapBufferARB, NULL, 519),
+    NAME_FUNC_OFFSET(19770, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
+    NAME_FUNC_OFFSET(19784, glBeginQueryARB, glBeginQueryARB, NULL, 521),
+    NAME_FUNC_OFFSET(19797, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
+    NAME_FUNC_OFFSET(19813, glEndQueryARB, glEndQueryARB, NULL, 523),
+    NAME_FUNC_OFFSET(19824, glGenQueriesARB, glGenQueriesARB, NULL, 524),
+    NAME_FUNC_OFFSET(19837, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
+    NAME_FUNC_OFFSET(19856, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
+    NAME_FUNC_OFFSET(19876, glGetQueryivARB, glGetQueryivARB, NULL, 527),
+    NAME_FUNC_OFFSET(19889, glIsQueryARB, glIsQueryARB, NULL, 528),
+    NAME_FUNC_OFFSET(19899, glCompileShaderARB, glCompileShaderARB, NULL, 530),
+    NAME_FUNC_OFFSET(19915, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
+    NAME_FUNC_OFFSET(19934, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
+    NAME_FUNC_OFFSET(19952, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
+    NAME_FUNC_OFFSET(19973, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
+    NAME_FUNC_OFFSET(19988, glGetUniformivARB, glGetUniformivARB, NULL, 544),
+    NAME_FUNC_OFFSET(20003, glLinkProgramARB, glLinkProgramARB, NULL, 545),
+    NAME_FUNC_OFFSET(20017, glShaderSourceARB, glShaderSourceARB, NULL, 546),
+    NAME_FUNC_OFFSET(20032, glUniform1fARB, glUniform1fARB, NULL, 547),
+    NAME_FUNC_OFFSET(20044, glUniform1fvARB, glUniform1fvARB, NULL, 548),
+    NAME_FUNC_OFFSET(20057, glUniform1iARB, glUniform1iARB, NULL, 549),
+    NAME_FUNC_OFFSET(20069, glUniform1ivARB, glUniform1ivARB, NULL, 550),
+    NAME_FUNC_OFFSET(20082, glUniform2fARB, glUniform2fARB, NULL, 551),
+    NAME_FUNC_OFFSET(20094, glUniform2fvARB, glUniform2fvARB, NULL, 552),
+    NAME_FUNC_OFFSET(20107, glUniform2iARB, glUniform2iARB, NULL, 553),
+    NAME_FUNC_OFFSET(20119, glUniform2ivARB, glUniform2ivARB, NULL, 554),
+    NAME_FUNC_OFFSET(20132, glUniform3fARB, glUniform3fARB, NULL, 555),
+    NAME_FUNC_OFFSET(20144, glUniform3fvARB, glUniform3fvARB, NULL, 556),
+    NAME_FUNC_OFFSET(20157, glUniform3iARB, glUniform3iARB, NULL, 557),
+    NAME_FUNC_OFFSET(20169, glUniform3ivARB, glUniform3ivARB, NULL, 558),
+    NAME_FUNC_OFFSET(20182, glUniform4fARB, glUniform4fARB, NULL, 559),
+    NAME_FUNC_OFFSET(20194, glUniform4fvARB, glUniform4fvARB, NULL, 560),
+    NAME_FUNC_OFFSET(20207, glUniform4iARB, glUniform4iARB, NULL, 561),
+    NAME_FUNC_OFFSET(20219, glUniform4ivARB, glUniform4ivARB, NULL, 562),
+    NAME_FUNC_OFFSET(20232, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
+    NAME_FUNC_OFFSET(20251, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
+    NAME_FUNC_OFFSET(20270, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
+    NAME_FUNC_OFFSET(20289, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
+    NAME_FUNC_OFFSET(20302, glValidateProgramARB, glValidateProgramARB, NULL, 567),
+    NAME_FUNC_OFFSET(20320, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
+    NAME_FUNC_OFFSET(20341, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
+    NAME_FUNC_OFFSET(20359, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
+    NAME_FUNC_OFFSET(20379, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(20393, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(20410, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(20435, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(20457, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(20484, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(20508, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
+    NAME_FUNC_OFFSET(20544, gl_dispatch_stub_633, gl_dispatch_stub_633, NULL, 633),
+    NAME_FUNC_OFFSET(20560, gl_dispatch_stub_634, gl_dispatch_stub_634, NULL, 634),
+    NAME_FUNC_OFFSET(20579, glPointParameterfEXT, glPointParameterfEXT, NULL, 641),
+    NAME_FUNC_OFFSET(20597, glPointParameterfEXT, glPointParameterfEXT, NULL, 641),
+    NAME_FUNC_OFFSET(20618, glPointParameterfEXT, glPointParameterfEXT, NULL, 641),
+    NAME_FUNC_OFFSET(20640, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 642),
+    NAME_FUNC_OFFSET(20659, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 642),
+    NAME_FUNC_OFFSET(20681, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 642),
+    NAME_FUNC_OFFSET(20704, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 645),
+    NAME_FUNC_OFFSET(20723, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 646),
+    NAME_FUNC_OFFSET(20743, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 647),
+    NAME_FUNC_OFFSET(20762, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 648),
+    NAME_FUNC_OFFSET(20782, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 649),
+    NAME_FUNC_OFFSET(20801, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 650),
+    NAME_FUNC_OFFSET(20821, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 651),
+    NAME_FUNC_OFFSET(20840, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 652),
+    NAME_FUNC_OFFSET(20860, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 653),
+    NAME_FUNC_OFFSET(20879, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 654),
+    NAME_FUNC_OFFSET(20899, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 655),
+    NAME_FUNC_OFFSET(20919, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 656),
+    NAME_FUNC_OFFSET(20940, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 657),
+    NAME_FUNC_OFFSET(20960, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 658),
+    NAME_FUNC_OFFSET(20981, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 659),
+    NAME_FUNC_OFFSET(21001, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 660),
+    NAME_FUNC_OFFSET(21022, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 661),
+    NAME_FUNC_OFFSET(21046, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 662),
+    NAME_FUNC_OFFSET(21064, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 663),
+    NAME_FUNC_OFFSET(21084, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 664),
+    NAME_FUNC_OFFSET(21102, glFogCoorddEXT, glFogCoorddEXT, NULL, 665),
+    NAME_FUNC_OFFSET(21114, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 666),
+    NAME_FUNC_OFFSET(21127, glFogCoordfEXT, glFogCoordfEXT, NULL, 667),
+    NAME_FUNC_OFFSET(21139, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 668),
+    NAME_FUNC_OFFSET(21152, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 670),
+    NAME_FUNC_OFFSET(21172, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 670),
+    NAME_FUNC_OFFSET(21196, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 687),
+    NAME_FUNC_OFFSET(21210, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 687),
+    NAME_FUNC_OFFSET(21227, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 688),
+    NAME_FUNC_OFFSET(21242, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 688),
+    NAME_FUNC_OFFSET(21260, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 689),
+    NAME_FUNC_OFFSET(21274, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 689),
+    NAME_FUNC_OFFSET(21291, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 690),
+    NAME_FUNC_OFFSET(21306, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 690),
+    NAME_FUNC_OFFSET(21324, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 691),
+    NAME_FUNC_OFFSET(21338, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 691),
+    NAME_FUNC_OFFSET(21355, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 692),
+    NAME_FUNC_OFFSET(21370, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 692),
+    NAME_FUNC_OFFSET(21388, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 693),
+    NAME_FUNC_OFFSET(21402, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 693),
+    NAME_FUNC_OFFSET(21419, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 694),
+    NAME_FUNC_OFFSET(21434, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 694),
+    NAME_FUNC_OFFSET(21452, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 695),
+    NAME_FUNC_OFFSET(21466, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 695),
+    NAME_FUNC_OFFSET(21483, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 696),
+    NAME_FUNC_OFFSET(21498, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 696),
+    NAME_FUNC_OFFSET(21516, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 697),
+    NAME_FUNC_OFFSET(21530, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 697),
+    NAME_FUNC_OFFSET(21547, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 698),
+    NAME_FUNC_OFFSET(21562, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 698),
+    NAME_FUNC_OFFSET(21580, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 699),
+    NAME_FUNC_OFFSET(21594, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 699),
+    NAME_FUNC_OFFSET(21611, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 700),
+    NAME_FUNC_OFFSET(21626, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 700),
+    NAME_FUNC_OFFSET(21644, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 701),
+    NAME_FUNC_OFFSET(21658, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 701),
+    NAME_FUNC_OFFSET(21675, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 702),
+    NAME_FUNC_OFFSET(21690, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 702),
+    NAME_FUNC_OFFSET(21708, glBindProgramNV, glBindProgramNV, NULL, 721),
+    NAME_FUNC_OFFSET(21725, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 722),
+    NAME_FUNC_OFFSET(21745, glGenProgramsNV, glGenProgramsNV, NULL, 724),
+    NAME_FUNC_OFFSET(21762, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 730),
+    NAME_FUNC_OFFSET(21788, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 730),
+    NAME_FUNC_OFFSET(21817, glIsProgramNV, glIsProgramNV, NULL, 734),
+    NAME_FUNC_OFFSET(21832, glPointParameteriNV, glPointParameteriNV, NULL, 798),
+    NAME_FUNC_OFFSET(21850, glPointParameterivNV, glPointParameterivNV, NULL, 799),
+    NAME_FUNC_OFFSET(21869, gl_dispatch_stub_802, gl_dispatch_stub_802, NULL, 802),
+    NAME_FUNC_OFFSET(21890, gl_dispatch_stub_804, gl_dispatch_stub_804, NULL, 804),
+    NAME_FUNC_OFFSET(21906, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 811),
+    NAME_FUNC_OFFSET(21930, gl_dispatch_stub_814, gl_dispatch_stub_814, NULL, 814),
+    NAME_FUNC_OFFSET(21954, gl_dispatch_stub_814, gl_dispatch_stub_814, NULL, 814),
+    NAME_FUNC_OFFSET(21981, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 815),
+    NAME_FUNC_OFFSET(21999, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 816),
+    NAME_FUNC_OFFSET(22018, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 817),
+    NAME_FUNC_OFFSET(22043, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 818),
+    NAME_FUNC_OFFSET(22064, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 819),
+    NAME_FUNC_OFFSET(22086, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 820),
+    NAME_FUNC_OFFSET(22112, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 821),
+    NAME_FUNC_OFFSET(22135, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 822),
+    NAME_FUNC_OFFSET(22158, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 823),
+    NAME_FUNC_OFFSET(22181, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 824),
+    NAME_FUNC_OFFSET(22199, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 825),
+    NAME_FUNC_OFFSET(22218, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 826),
+    NAME_FUNC_OFFSET(22235, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 827),
+    NAME_FUNC_OFFSET(22273, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 828),
+    NAME_FUNC_OFFSET(22302, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 829),
+    NAME_FUNC_OFFSET(22318, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 830),
+    NAME_FUNC_OFFSET(22335, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 831),
+    NAME_FUNC_OFFSET(22357, gl_dispatch_stub_832, gl_dispatch_stub_832, NULL, 832),
+    NAME_FUNC_OFFSET(22375, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 835),
+    NAME_FUNC_OFFSET(22398, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 836),
+    NAME_FUNC_OFFSET(22420, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 837),
+    NAME_FUNC_OFFSET(22436, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 838),
+    NAME_FUNC_OFFSET(22457, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 839),
+    NAME_FUNC_OFFSET(22479, glUniform1uiEXT, glUniform1uiEXT, NULL, 840),
+    NAME_FUNC_OFFSET(22492, glUniform1uivEXT, glUniform1uivEXT, NULL, 841),
+    NAME_FUNC_OFFSET(22506, glUniform2uiEXT, glUniform2uiEXT, NULL, 842),
+    NAME_FUNC_OFFSET(22519, glUniform2uivEXT, glUniform2uivEXT, NULL, 843),
+    NAME_FUNC_OFFSET(22533, glUniform3uiEXT, glUniform3uiEXT, NULL, 844),
+    NAME_FUNC_OFFSET(22546, glUniform3uivEXT, glUniform3uivEXT, NULL, 845),
+    NAME_FUNC_OFFSET(22560, glUniform4uiEXT, glUniform4uiEXT, NULL, 846),
+    NAME_FUNC_OFFSET(22573, glUniform4uivEXT, glUniform4uivEXT, NULL, 847),
+    NAME_FUNC_OFFSET(22587, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 848),
+    NAME_FUNC_OFFSET(22605, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 849),
+    NAME_FUNC_OFFSET(22624, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 850),
+    NAME_FUNC_OFFSET(22643, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 851),
+    NAME_FUNC_OFFSET(22663, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 852),
+    NAME_FUNC_OFFSET(22681, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 853),
+    NAME_FUNC_OFFSET(22700, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 854),
+    NAME_FUNC_OFFSET(22719, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 855),
+    NAME_FUNC_OFFSET(22739, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 856),
+    NAME_FUNC_OFFSET(22757, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 857),
+    NAME_FUNC_OFFSET(22776, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 858),
+    NAME_FUNC_OFFSET(22795, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 859),
+    NAME_FUNC_OFFSET(22815, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 860),
+    NAME_FUNC_OFFSET(22834, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 861),
+    NAME_FUNC_OFFSET(22852, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 862),
+    NAME_FUNC_OFFSET(22871, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 863),
+    NAME_FUNC_OFFSET(22890, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 864),
+    NAME_FUNC_OFFSET(22910, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 865),
+    NAME_FUNC_OFFSET(22929, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 866),
+    NAME_FUNC_OFFSET(22949, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 867),
+    NAME_FUNC_OFFSET(22969, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 868),
+    NAME_FUNC_OFFSET(22992, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 869),
+    NAME_FUNC_OFFSET(23018, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 870),
+    NAME_FUNC_OFFSET(23031, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 871),
+    NAME_FUNC_OFFSET(23042, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 872),
+    NAME_FUNC_OFFSET(23052, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 873),
+    NAME_FUNC_OFFSET(23068, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 874),
+    NAME_FUNC_OFFSET(23084, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 875),
+    NAME_FUNC_OFFSET(23097, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 878),
+    NAME_FUNC_OFFSET(23118, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 879),
+    NAME_FUNC_OFFSET(23140, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 880),
+    NAME_FUNC_OFFSET(23158, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 881),
+    NAME_FUNC_OFFSET(23177, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 882),
+    NAME_FUNC_OFFSET(23202, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 883),
+    NAME_FUNC_OFFSET(23225, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 884),
+    NAME_FUNC_OFFSET(23250, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 885),
+    NAME_FUNC_OFFSET(23267, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 887),
+    NAME_FUNC_OFFSET(23285, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 888),
+    NAME_FUNC_OFFSET(23308, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 889),
+    NAME_FUNC_OFFSET(23338, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 890),
+    NAME_FUNC_OFFSET(23366, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 891),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index f98f7df7407..39388c8e493 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -100,6 +100,7 @@ main_sources = [
     'main/readpix.c',
     'main/remap.c',
     'main/renderbuffer.c',
+    'main/samplerobj.c',
     'main/scissor.c',
     'main/shaderapi.c',
     'main/shaderobj.c',
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 2b00e8979d2..c92bf29c30f 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1124,12 +1124,12 @@ blitframebuffer_texture(struct gl_context *ctx,
       if (readAtt && readAtt->Texture) {
          const struct gl_texture_object *texObj = readAtt->Texture;
          const GLuint srcLevel = readAtt->TextureLevel;
-         const GLenum minFilterSave = texObj->MinFilter;
-         const GLenum magFilterSave = texObj->MagFilter;
+         const GLenum minFilterSave = texObj->Sampler.MinFilter;
+         const GLenum magFilterSave = texObj->Sampler.MagFilter;
          const GLint baseLevelSave = texObj->BaseLevel;
          const GLint maxLevelSave = texObj->MaxLevel;
-         const GLenum wrapSSave = texObj->WrapS;
-         const GLenum wrapTSave = texObj->WrapT;
+         const GLenum wrapSSave = texObj->Sampler.WrapS;
+         const GLenum wrapTSave = texObj->Sampler.WrapT;
          const GLenum target = texObj->Target;
 
          if (drawAtt->Texture == readAtt->Texture) {
@@ -2259,13 +2259,13 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
    struct vertex verts[4];
    const GLuint baseLevel = texObj->BaseLevel;
    const GLuint maxLevel = texObj->MaxLevel;
-   const GLenum minFilterSave = texObj->MinFilter;
-   const GLenum magFilterSave = texObj->MagFilter;
+   const GLenum minFilterSave = texObj->Sampler.MinFilter;
+   const GLenum magFilterSave = texObj->Sampler.MagFilter;
    const GLint maxLevelSave = texObj->MaxLevel;
    const GLboolean genMipmapSave = texObj->GenerateMipmap;
-   const GLenum wrapSSave = texObj->WrapS;
-   const GLenum wrapTSave = texObj->WrapT;
-   const GLenum wrapRSave = texObj->WrapR;
+   const GLenum wrapSSave = texObj->Sampler.WrapS;
+   const GLenum wrapTSave = texObj->Sampler.WrapT;
+   const GLenum wrapRSave = texObj->Sampler.WrapR;
    const GLuint fboSave = ctx->DrawBuffer->Name;
    const GLuint original_active_unit = ctx->Texture.CurrentUnit;
    GLenum faceTarget;
diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index 8eec07d5bcc..e927cf0addd 100644
--- a/src/mesa/drivers/dri/common/texmem.c
+++ b/src/mesa/drivers/dri/common/texmem.c
@@ -1264,17 +1264,18 @@ driCalculateTextureFirstLastLevel( driTextureObject * t )
    case GL_TEXTURE_2D:
    case GL_TEXTURE_3D:
    case GL_TEXTURE_CUBE_MAP:
-      if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+      if (tObj->Sampler.MinFilter == GL_NEAREST ||
+          tObj->Sampler.MinFilter == GL_LINEAR) {
          /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.
           */
 
          firstLevel = lastLevel = tObj->BaseLevel;
       }
       else {
-	 firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);
+	 firstLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MinLod + 0.5);
 	 firstLevel = MAX2(firstLevel, tObj->BaseLevel);
 	 firstLevel = MIN2(firstLevel, tObj->BaseLevel + baseImage->MaxLog2);
-	 lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);
+	 lastLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MaxLod + 0.5);
 	 lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);
 	 lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);
 	 lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);
diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c
index 49364aeb225..dba4ebaa5c7 100644
--- a/src/mesa/drivers/dri/i810/i810tex.c
+++ b/src/mesa/drivers/dri/i810/i810tex.c
@@ -204,10 +204,10 @@ i810AllocTexObj( struct gl_context *ctx, struct gl_texture_object *texObj )
       
       make_empty_list( & t->base );
 
-      i810SetTexWrapping( t, texObj->WrapS, texObj->WrapT );
+      i810SetTexWrapping( t, texObj->Sampler.WrapS, texObj->Sampler.WrapT );
       /*i830SetTexMaxAnisotropy( t, texObj->MaxAnisotropy );*/
-      i810SetTexFilter( imesa, t, texObj->MinFilter, texObj->MagFilter, bias );
-      i810SetTexBorderColor( t, texObj->BorderColor.f );
+      i810SetTexFilter( imesa, t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter, bias );
+      i810SetTexBorderColor( t, texObj->Sampler.BorderColor.f );
    }
 
    return t;
@@ -238,17 +238,17 @@ static void i810TexParameter( struct gl_context *ctx, GLenum target,
    case GL_TEXTURE_MAG_FILTER:
       {
          GLfloat bias = ctx->Texture.Unit[ctx->Texture.CurrentUnit].LodBias;
-         i810SetTexFilter( imesa, t, tObj->MinFilter, tObj->MagFilter, bias );
+         i810SetTexFilter( imesa, t, tObj->Sampler.MinFilter, tObj->Sampler.MagFilter, bias );
       }
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
-      i810SetTexWrapping( t, tObj->WrapS, tObj->WrapT );
+      i810SetTexWrapping( t, tObj->Sampler.WrapS, tObj->Sampler.WrapT );
       break;
   
    case GL_TEXTURE_BORDER_COLOR:
-      i810SetTexBorderColor( t, tObj->BorderColor.f );
+      i810SetTexBorderColor( t, tObj->Sampler.BorderColor.f );
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c
index c35b4b5ed06..7554bd5e7b9 100644
--- a/src/mesa/drivers/dri/i915/i830_texstate.c
+++ b/src/mesa/drivers/dri/i915/i830_texstate.c
@@ -193,7 +193,7 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
       float maxlod;
       uint32_t minlod_fixed, maxlod_fixed;
 
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          minFilt = FILTER_NEAREST;
          mipFilt = MIPFILTER_NONE;
@@ -222,12 +222,12 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
          return GL_FALSE;
       }
 
-      if (tObj->MaxAnisotropy > 1.0) {
+      if (tObj->Sampler.MaxAnisotropy > 1.0) {
          minFilt = FILTER_ANISOTROPIC;
          magFilt = FILTER_ANISOTROPIC;
       }
       else {
-         switch (tObj->MagFilter) {
+         switch (tObj->Sampler.MagFilter) {
          case GL_NEAREST:
             magFilt = FILTER_NEAREST;
             break;
@@ -239,7 +239,7 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
          }
       }
 
-      lodbias = (int) ((tUnit->LodBias + tObj->LodBias) * 16.0);
+      lodbias = (int) ((tUnit->LodBias + tObj->Sampler.LodBias) * 16.0);
       if (lodbias < -64)
           lodbias = -64;
       if (lodbias > 63)
@@ -259,8 +259,8 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
        * addressable (smallest resolution) LOD.  Use it to cover both
        * MAX_LEVEL and MAX_LOD.
        */
-      minlod_fixed = U_FIXED(CLAMP(tObj->MinLod, 0.0, 11), 4);
-      maxlod = MIN2(tObj->MaxLod, tObj->_MaxLevel - tObj->BaseLevel);
+      minlod_fixed = U_FIXED(CLAMP(tObj->Sampler.MinLod, 0.0, 11), 4);
+      maxlod = MIN2(tObj->Sampler.MaxLod, tObj->_MaxLevel - tObj->BaseLevel);
       if (intel->intelScreen->deviceID == PCI_CHIP_I855_GM ||
 	  intel->intelScreen->deviceID == PCI_CHIP_I865_G) {
 	 maxlod_fixed = U_FIXED(CLAMP(maxlod, 0.0, 11.75), 2);
@@ -279,8 +279,8 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    }
 
    {
-      GLenum ws = tObj->WrapS;
-      GLenum wt = tObj->WrapT;
+      GLenum ws = tObj->Sampler.WrapS;
+      GLenum wt = tObj->Sampler.WrapT;
 
 
       /* 3D textures not available on i830
@@ -300,10 +300,10 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    }
 
    /* convert border color from float to ubyte */
-   CLAMPED_FLOAT_TO_UBYTE(border[0], tObj->BorderColor.f[0]);
-   CLAMPED_FLOAT_TO_UBYTE(border[1], tObj->BorderColor.f[1]);
-   CLAMPED_FLOAT_TO_UBYTE(border[2], tObj->BorderColor.f[2]);
-   CLAMPED_FLOAT_TO_UBYTE(border[3], tObj->BorderColor.f[3]);
+   CLAMPED_FLOAT_TO_UBYTE(border[0], tObj->Sampler.BorderColor.f[0]);
+   CLAMPED_FLOAT_TO_UBYTE(border[1], tObj->Sampler.BorderColor.f[1]);
+   CLAMPED_FLOAT_TO_UBYTE(border[2], tObj->Sampler.BorderColor.f[2]);
+   CLAMPED_FLOAT_TO_UBYTE(border[3], tObj->Sampler.BorderColor.f[3]);
 
    state[I830_TEXREG_TM0S4] = PACK_COLOR_8888(border[3],
 					      border[0],
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index af140c85f50..742bb994adb 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -164,7 +164,7 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
 
    format = translate_texture_format(firstImage->TexFormat,
 				     firstImage->InternalFormat,
-				     tObj->DepthMode);
+				     tObj->Sampler.DepthMode);
    pitch = intelObj->mt->region->pitch * intelObj->mt->cpp;
 
    state[I915_TEXREG_MS3] =
@@ -181,7 +181,7 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
     * (lowest resolution) LOD.  Use it to cover both MAX_LEVEL and
     * MAX_LOD.
     */
-   maxlod = MIN2(tObj->MaxLod, tObj->_MaxLevel - tObj->BaseLevel);
+   maxlod = MIN2(tObj->Sampler.MaxLod, tObj->_MaxLevel - tObj->BaseLevel);
    state[I915_TEXREG_MS4] =
       ((((pitch / 4) - 1) << MS4_PITCH_SHIFT) |
        MS4_CUBE_FACE_ENA_MASK |
@@ -192,7 +192,7 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    {
       GLuint minFilt, mipFilt, magFilt;
 
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          minFilt = FILTER_NEAREST;
          mipFilt = MIPFILTER_NONE;
@@ -221,16 +221,16 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
          return GL_FALSE;
       }
 
-      if (tObj->MaxAnisotropy > 1.0) {
+      if (tObj->Sampler.MaxAnisotropy > 1.0) {
          minFilt = FILTER_ANISOTROPIC;
          magFilt = FILTER_ANISOTROPIC;
-         if (tObj->MaxAnisotropy > 2.0)
+         if (tObj->Sampler.MaxAnisotropy > 2.0)
             aniso = SS2_MAX_ANISO_4;
          else
             aniso = SS2_MAX_ANISO_2;
       }
       else {
-         switch (tObj->MagFilter) {
+         switch (tObj->Sampler.MagFilter) {
          case GL_NEAREST:
             magFilt = FILTER_NEAREST;
             break;
@@ -242,7 +242,7 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
          }
       }
 
-      lodbias = (int) ((tUnit->LodBias + tObj->LodBias) * 16.0);
+      lodbias = (int) ((tUnit->LodBias + tObj->Sampler.LodBias) * 16.0);
       if (lodbias < -256)
           lodbias = -256;
       if (lodbias > 255)
@@ -258,14 +258,14 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
 
       /* Shadow:
        */
-      if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB &&
+      if (tObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB &&
           tObj->Target != GL_TEXTURE_3D) {
          if (tObj->Target == GL_TEXTURE_1D) 
             return GL_FALSE;
 
          state[I915_TEXREG_SS2] |=
             (SS2_SHADOW_ENABLE |
-             intel_translate_shadow_compare_func(tObj->CompareFunc));
+             intel_translate_shadow_compare_func(tObj->Sampler.CompareFunc));
 
          minFilt = FILTER_4X4_FLAT;
          magFilt = FILTER_4X4_FLAT;
@@ -278,9 +278,9 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    }
 
    {
-      GLenum ws = tObj->WrapS;
-      GLenum wt = tObj->WrapT;
-      GLenum wr = tObj->WrapR;
+      GLenum ws = tObj->Sampler.WrapS;
+      GLenum wt = tObj->Sampler.WrapT;
+      GLenum wr = tObj->Sampler.WrapR;
       float minlod;
 
       /* We program 1D textures as 2D textures, so the 2D texcoord could
@@ -298,8 +298,8 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
        * clamp_to_border.
        */
       if (tObj->Target == GL_TEXTURE_3D &&
-          (tObj->MinFilter != GL_NEAREST ||
-           tObj->MagFilter != GL_NEAREST) &&
+          (tObj->Sampler.MinFilter != GL_NEAREST ||
+           tObj->Sampler.MagFilter != GL_NEAREST) &&
           (ws == GL_CLAMP ||
            wt == GL_CLAMP ||
            wr == GL_CLAMP ||
@@ -322,7 +322,7 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
           (translate_wrap_mode(wt) << SS3_TCY_ADDR_MODE_SHIFT) |
           (translate_wrap_mode(wr) << SS3_TCZ_ADDR_MODE_SHIFT));
 
-      minlod = MIN2(tObj->MinLod, tObj->_MaxLevel - tObj->BaseLevel);
+      minlod = MIN2(tObj->Sampler.MinLod, tObj->_MaxLevel - tObj->BaseLevel);
       state[I915_TEXREG_SS3] |= (unit << SS3_TEXTUREMAP_INDEX_SHIFT);
       state[I915_TEXREG_SS3] |= (U_FIXED(CLAMP(minlod, 0.0, 11.0), 4) <<
 				 SS3_MIN_LOD_SHIFT);
@@ -330,10 +330,10 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
    }
 
    /* convert border color from float to ubyte */
-   CLAMPED_FLOAT_TO_UBYTE(border[0], tObj->BorderColor.f[0]);
-   CLAMPED_FLOAT_TO_UBYTE(border[1], tObj->BorderColor.f[1]);
-   CLAMPED_FLOAT_TO_UBYTE(border[2], tObj->BorderColor.f[2]);
-   CLAMPED_FLOAT_TO_UBYTE(border[3], tObj->BorderColor.f[3]);
+   CLAMPED_FLOAT_TO_UBYTE(border[0], tObj->Sampler.BorderColor.f[0]);
+   CLAMPED_FLOAT_TO_UBYTE(border[1], tObj->Sampler.BorderColor.f[1]);
+   CLAMPED_FLOAT_TO_UBYTE(border[2], tObj->Sampler.BorderColor.f[2]);
+   CLAMPED_FLOAT_TO_UBYTE(border[3], tObj->Sampler.BorderColor.f[3]);
 
    if (firstImage->_BaseFormat == GL_DEPTH_COMPONENT) {
       /* GL specs that border color for depth textures is taken from the
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index f5abe021c43..63ae28f8575 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -271,20 +271,20 @@ static GLboolean check_fallbacks( struct brw_context *brw,
          struct gl_texture_unit *texUnit = &ctx->Texture.Unit[u];
          if (texUnit->Enabled) {
             if (texUnit->Enabled & TEXTURE_1D_BIT) {
-               if (texUnit->CurrentTex[TEXTURE_1D_INDEX]->WrapS == GL_CLAMP) {
+               if (texUnit->CurrentTex[TEXTURE_1D_INDEX]->Sampler.WrapS == GL_CLAMP) {
                    return GL_TRUE;
                }
             }
             if (texUnit->Enabled & TEXTURE_2D_BIT) {
-               if (texUnit->CurrentTex[TEXTURE_2D_INDEX]->WrapS == GL_CLAMP ||
-                   texUnit->CurrentTex[TEXTURE_2D_INDEX]->WrapT == GL_CLAMP) {
+               if (texUnit->CurrentTex[TEXTURE_2D_INDEX]->Sampler.WrapS == GL_CLAMP ||
+                   texUnit->CurrentTex[TEXTURE_2D_INDEX]->Sampler.WrapT == GL_CLAMP) {
                    return GL_TRUE;
                }
             }
             if (texUnit->Enabled & TEXTURE_3D_BIT) {
-               if (texUnit->CurrentTex[TEXTURE_3D_INDEX]->WrapS == GL_CLAMP ||
-                   texUnit->CurrentTex[TEXTURE_3D_INDEX]->WrapT == GL_CLAMP ||
-                   texUnit->CurrentTex[TEXTURE_3D_INDEX]->WrapR == GL_CLAMP) {
+               if (texUnit->CurrentTex[TEXTURE_3D_INDEX]->Sampler.WrapS == GL_CLAMP ||
+                   texUnit->CurrentTex[TEXTURE_3D_INDEX]->Sampler.WrapT == GL_CLAMP ||
+                   texUnit->CurrentTex[TEXTURE_3D_INDEX]->Sampler.WrapR == GL_CLAMP) {
                    return GL_TRUE;
                }
             }
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index ca51d1599a4..2dd28fd1c58 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -370,14 +370,14 @@ static void brw_wm_populate_key( struct brw_context *brw,
 	  * well and our shadow compares always return the result in
 	  * all 4 channels.
 	  */
-	 if (t->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
-	    if (t->DepthMode == GL_ALPHA) {
+	 if (t->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+	    if (t->Sampler.DepthMode == GL_ALPHA) {
 	       swizzles[0] = SWIZZLE_ZERO;
 	       swizzles[1] = SWIZZLE_ZERO;
 	       swizzles[2] = SWIZZLE_ZERO;
-	    } else if (t->DepthMode == GL_LUMINANCE) {
+	    } else if (t->Sampler.DepthMode == GL_LUMINANCE) {
 	       swizzles[3] = SWIZZLE_ONE;
-	    } else if (t->DepthMode == GL_RED) {
+	    } else if (t->Sampler.DepthMode == GL_RED) {
 	       /* See table 3.23 of the GL 3.0 spec. */
 	       swizzles[1] = SWIZZLE_ZERO;
 	       swizzles[2] = SWIZZLE_ZERO;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
index 30672b4251b..cfc30d8613f 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
@@ -288,26 +288,26 @@ brw_wm_sampler_populate_key(struct brw_context *brw,
 	 entry->seamless_cube_map = (texObj->Target == GL_TEXTURE_CUBE_MAP)
 	    ? ctx->Texture.CubeMapSeamless : GL_FALSE;
 
-	 entry->wrap_r = texObj->WrapR;
-	 entry->wrap_s = texObj->WrapS;
-	 entry->wrap_t = texObj->WrapT;
-
-	 entry->maxlod = texObj->MaxLod;
-	 entry->minlod = texObj->MinLod;
-	 entry->lod_bias = texUnit->LodBias + texObj->LodBias;
-	 entry->max_aniso = texObj->MaxAnisotropy;
-	 entry->minfilter = texObj->MinFilter;
-	 entry->magfilter = texObj->MagFilter;
-	 entry->comparemode = texObj->CompareMode;
-         entry->comparefunc = texObj->CompareFunc;
+	 entry->wrap_r = texObj->Sampler.WrapR;
+	 entry->wrap_s = texObj->Sampler.WrapS;
+	 entry->wrap_t = texObj->Sampler.WrapT;
+
+	 entry->maxlod = texObj->Sampler.MaxLod;
+	 entry->minlod = texObj->Sampler.MinLod;
+	 entry->lod_bias = texUnit->LodBias + texObj->Sampler.LodBias;
+	 entry->max_aniso = texObj->Sampler.MaxAnisotropy;
+	 entry->minfilter = texObj->Sampler.MinFilter;
+	 entry->magfilter = texObj->Sampler.MagFilter;
+	 entry->comparemode = texObj->Sampler.CompareMode;
+         entry->comparefunc = texObj->Sampler.CompareFunc;
 
 	 drm_intel_bo_unreference(brw->wm.sdc_bo[unit]);
 	 if (firstImage->_BaseFormat == GL_DEPTH_COMPONENT) {
 	    float bordercolor[4] = {
-	       texObj->BorderColor.f[0],
-	       texObj->BorderColor.f[0],
-	       texObj->BorderColor.f[0],
-	       texObj->BorderColor.f[0]
+	       texObj->Sampler.BorderColor.f[0],
+	       texObj->Sampler.BorderColor.f[0],
+	       texObj->Sampler.BorderColor.f[0],
+	       texObj->Sampler.BorderColor.f[0]
 	    };
 	    /* GL specs that border color for depth textures is taken from the
 	     * R channel, while the hardware uses A.  Spam R into all the
@@ -316,7 +316,7 @@ brw_wm_sampler_populate_key(struct brw_context *brw,
 	    brw->wm.sdc_bo[unit] = upload_default_color(brw, bordercolor);
 	 } else {
 	    brw->wm.sdc_bo[unit] = upload_default_color(brw,
-							texObj->BorderColor.f);
+							texObj->Sampler.BorderColor.f);
 	 }
 	 key->sampler_count = unit + 1;
       }
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index aeda4d5ce4e..5a478a76e5c 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -201,8 +201,9 @@ brw_update_texture_surface( struct gl_context *ctx, GLuint unit )
    surf->ss0.mipmap_layout_mode = BRW_SURFACE_MIPMAPLAYOUT_BELOW;
    surf->ss0.surface_type = translate_tex_target(tObj->Target);
    surf->ss0.surface_format = translate_tex_format(firstImage->TexFormat,
-						  firstImage->InternalFormat,
-						  tObj->DepthMode, tObj->sRGBDecode);
+                                                   firstImage->InternalFormat,
+                                                   tObj->Sampler.DepthMode,
+                                                   tObj->Sampler.sRGBDecode);
 
    /* This is ok for all textures with channel width 8bit or less:
     */
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index b3a2b1b0c85..775fd1008f9 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -112,8 +112,8 @@ intel_miptree_create_for_teximage(struct intel_context *intel,
        * resizable buffers, or require that buffers implement lazy
        * pagetable arrangements.
        */
-      if ((intelObj->base.MinFilter == GL_NEAREST ||
-	   intelObj->base.MinFilter == GL_LINEAR) &&
+      if ((intelObj->base.Sampler.MinFilter == GL_NEAREST ||
+	   intelObj->base.Sampler.MinFilter == GL_LINEAR) &&
 	  intelImage->level == firstLevel &&
 	  (intel->gen < 4 || firstLevel == 0)) {
 	 lastLevel = firstLevel;
diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index a11b07ed09d..5e705c93619 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -18,7 +18,7 @@ intel_update_max_level(struct intel_context *intel,
 {
    struct gl_texture_object *tObj = &intelObj->base;
 
-   if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+   if (tObj->Sampler.MinFilter == GL_NEAREST || tObj->Sampler.MinFilter == GL_LINEAR) {
       intelObj->_MaxLevel = tObj->BaseLevel;
    } else {
       intelObj->_MaxLevel = tObj->_MaxLevel;
diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.c b/src/mesa/drivers/dri/mach64/mach64_tex.c
index 68d273a3e75..8e10b314b64 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.c
@@ -123,9 +123,9 @@ mach64AllocTexObj( struct gl_texture_object *texObj )
 
    make_empty_list( (driTextureObject *) t );
 
-   mach64SetTexWrap( t, texObj->WrapS, texObj->WrapT );
-   mach64SetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
-   mach64SetTexBorderColor( t, texObj->BorderColor.f );
+   mach64SetTexWrap( t, texObj->Sampler.WrapS, texObj->Sampler.WrapT );
+   mach64SetTexFilter( t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter );
+   mach64SetTexBorderColor( t, texObj->Sampler.BorderColor.f );
 
    return t;
 }
@@ -454,18 +454,18 @@ static void mach64DDTexParameter( struct gl_context *ctx, GLenum target,
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
       if ( t->base.bound ) FLUSH_BATCH( mmesa );
-      mach64SetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
+      mach64SetTexFilter( t, tObj->Sampler.MinFilter, tObj->Sampler.MagFilter );
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
       if ( t->base.bound ) FLUSH_BATCH( mmesa );
-      mach64SetTexWrap( t, tObj->WrapS, tObj->WrapT );
+      mach64SetTexWrap( t, tObj->Sampler.WrapS, tObj->Sampler.WrapT );
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
       if ( t->base.bound ) FLUSH_BATCH( mmesa );
-      mach64SetTexBorderColor( t, tObj->BorderColor.f );
+      mach64SetTexBorderColor( t, tObj->Sampler.BorderColor.f );
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
diff --git a/src/mesa/drivers/dri/mga/mgatex.c b/src/mesa/drivers/dri/mga/mgatex.c
index 11ab9b6117d..ebbfec36556 100644
--- a/src/mesa/drivers/dri/mga/mgatex.c
+++ b/src/mesa/drivers/dri/mga/mgatex.c
@@ -327,9 +327,9 @@ mgaAllocTexObj( struct gl_texture_object *tObj )
 
       make_empty_list( & t->base );
 
-      mgaSetTexWrapping( t, tObj->WrapS, tObj->WrapT );
-      mgaSetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
-      mgaSetTexBorderColor( t, tObj->BorderColor.f );
+      mgaSetTexWrapping( t, tObj->Sampler.WrapS, tObj->Sampler.WrapT );
+      mgaSetTexFilter( t, tObj->Sampler.MinFilter, tObj->Sampler.MagFilter );
+      mgaSetTexBorderColor( t, tObj->Sampler.BorderColor.f );
    }
 
    return( t );
@@ -447,18 +447,18 @@ mgaTexParameter( struct gl_context *ctx, GLenum target,
       /* FALLTHROUGH */
    case GL_TEXTURE_MAG_FILTER:
       FLUSH_BATCH(mmesa);
-      mgaSetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
+      mgaSetTexFilter( t, tObj->Sampler.MinFilter, tObj->Sampler.MagFilter );
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
       FLUSH_BATCH(mmesa);
-      mgaSetTexWrapping(t,tObj->WrapS,tObj->WrapT);
+      mgaSetTexWrapping(t,tObj->Sampler.WrapS,tObj->Sampler.WrapT);
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
       FLUSH_BATCH(mmesa);
-      mgaSetTexBorderColor(t, tObj->BorderColor.f);
+      mgaSetTexBorderColor(t, tObj->Sampler.BorderColor.f);
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 1a1e10e0b3a..36e68c99181 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -270,8 +270,8 @@ get_last_level(struct gl_texture_object *t)
 {
 	struct gl_texture_image *base = t->Image[0][t->BaseLevel];
 
-	if (t->MinFilter == GL_NEAREST ||
-	    t->MinFilter == GL_LINEAR || !base)
+	if (t->Sampler.MinFilter == GL_NEAREST ||
+	    t->Sampler.MinFilter == GL_LINEAR || !base)
 		return t->BaseLevel;
 	else
 		return MIN2(t->BaseLevel + base->MaxLog2, t->MaxLevel);
diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
index 5ed8b147559..6c96e580013 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
@@ -80,8 +80,8 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
 
 		s = &to_nouveau_texture(t)->surfaces[t->BaseLevel];
 
-		if (t->MinFilter != GL_NEAREST &&
-		    t->MinFilter != GL_LINEAR) {
+		if (t->Sampler.MinFilter != GL_NEAREST &&
+		    t->Sampler.MinFilter != GL_LINEAR) {
 			lod_max = CLAMP(MIN2(t->MaxLod, t->_MaxLambda),
 					0, 15) + 1;
 
@@ -89,17 +89,17 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit)
 					 t->LodBias, -16, 15) * 8;
 		}
 
-		format |= nvgl_wrap_mode(t->WrapT) << 28 |
-			nvgl_wrap_mode(t->WrapS) << 24 |
+		format |= nvgl_wrap_mode(t->Sampler.WrapT) << 28 |
+			nvgl_wrap_mode(t->Sampler.WrapS) << 24 |
 			ti->HeightLog2 << 20 |
 			ti->WidthLog2 << 16 |
 			lod_max << 12 |
 			get_tex_format(ti);
 
 		filter |= log2i(t->MaxAnisotropy) << 31 |
-			nvgl_filter_mode(t->MagFilter) << 28 |
+			nvgl_filter_mode(t->Sampler.MagFilter) << 28 |
 			log2i(t->MaxAnisotropy) << 27 |
-			nvgl_filter_mode(t->MinFilter) << 24 |
+			nvgl_filter_mode(t->Sampler.MinFilter) << 24 |
 			(lod_bias & 0xff) << 16;
 
 	} else {
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
index fda67b15073..1d98b1970ef 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
@@ -173,14 +173,14 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
 		return;
 
 	/* Recompute the texturing registers. */
-	tx_format = nvgl_wrap_mode(t->WrapT) << 28
-		| nvgl_wrap_mode(t->WrapS) << 24
+	tx_format = nvgl_wrap_mode(t->Sampler.WrapT) << 28
+		| nvgl_wrap_mode(t->Sampler.WrapS) << 24
 		| ti->HeightLog2 << 20
 		| ti->WidthLog2 << 16
 		| 5 << 4 | 1 << 12;
 
-	tx_filter = nvgl_filter_mode(t->MagFilter) << 28
-		| nvgl_filter_mode(t->MinFilter) << 24;
+	tx_filter = nvgl_filter_mode(t->Sampler.MagFilter) << 28
+		| nvgl_filter_mode(t->Sampler.MinFilter) << 24;
 
 	tx_enable = NV10_3D_TEX_ENABLE_ENABLE
 		| log2i(t->MaxAnisotropy) << 4;
@@ -196,8 +196,8 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
 		tx_format |= get_tex_format_pot(ti);
 	}
 
-	if (t->MinFilter != GL_NEAREST &&
-	    t->MinFilter != GL_LINEAR) {
+	if (t->Sampler.MinFilter != GL_NEAREST &&
+	    t->Sampler.MinFilter != GL_LINEAR) {
 		int lod_min = t->MinLod;
 		int lod_max = MIN2(t->MaxLod, t->_MaxLambda);
 		int lod_bias = t->LodBias
diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
index c362aca0fdb..fdbfdf42595 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
@@ -186,12 +186,12 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
 		| NV20_3D_TEX_FORMAT_NO_BORDER
 		| 1 << 16;
 
-	tx_wrap = nvgl_wrap_mode(t->WrapR) << 16
-		| nvgl_wrap_mode(t->WrapT) << 8
-		| nvgl_wrap_mode(t->WrapS) << 0;
+	tx_wrap = nvgl_wrap_mode(t->Sampler.WrapR) << 16
+		| nvgl_wrap_mode(t->Sampler.WrapT) << 8
+		| nvgl_wrap_mode(t->Sampler.WrapS) << 0;
 
-	tx_filter = nvgl_filter_mode(t->MagFilter) << 24
-		| nvgl_filter_mode(t->MinFilter) << 16
+	tx_filter = nvgl_filter_mode(t->Sampler.MagFilter) << 24
+		| nvgl_filter_mode(t->Sampler.MinFilter) << 16
 		| 2 << 12;
 
 	tx_enable = NV20_3D_TEX_ENABLE_ENABLE
@@ -208,8 +208,8 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
 		tx_format |= get_tex_format_pot(ti);
 	}
 
-	if (t->MinFilter != GL_NEAREST &&
-	    t->MinFilter != GL_LINEAR) {
+	if (t->Sampler.MinFilter != GL_NEAREST &&
+	    t->Sampler.MinFilter != GL_LINEAR) {
 		int lod_min = t->MinLod;
 		int lod_max = MIN2(t->MaxLod, t->_MaxLambda);
 		int lod_bias = t->LodBias
diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index ba3305e076e..a3f6ce8edeb 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -162,9 +162,9 @@ static r128TexObjPtr r128AllocTexObj( struct gl_texture_object *texObj )
   
       make_empty_list( (driTextureObject *) t );
 
-      r128SetTexWrap( t, texObj->WrapS, texObj->WrapT );
-      r128SetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
-      r128SetTexBorderColor( t, texObj->BorderColor.f );
+      r128SetTexWrap( t, texObj->Sampler.WrapS, texObj->Sampler.WrapT );
+      r128SetTexFilter( t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter );
+      r128SetTexBorderColor( t, texObj->Sampler.BorderColor.f );
    }
 
    return t;
@@ -519,18 +519,18 @@ static void r128TexParameter( struct gl_context *ctx, GLenum target,
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
       if ( t->base.bound ) FLUSH_BATCH( rmesa );
-      r128SetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
+      r128SetTexFilter( t, tObj->Sampler.MinFilter, tObj->Sampler.MagFilter );
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
       if ( t->base.bound ) FLUSH_BATCH( rmesa );
-      r128SetTexWrap( t, tObj->WrapS, tObj->WrapT );
+      r128SetTexWrap( t, tObj->Sampler.WrapS, tObj->Sampler.WrapT );
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
       if ( t->base.bound ) FLUSH_BATCH( rmesa );
-      r128SetTexBorderColor( t, tObj->BorderColor.f );
+      r128SetTexBorderColor( t, tObj->Sampler.BorderColor.f );
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c
index 092b7575831..d42e8f12041 100644
--- a/src/mesa/drivers/dri/r200/r200_tex.c
+++ b/src/mesa/drivers/dri/r200/r200_tex.c
@@ -383,18 +383,18 @@ static void r200TexParameter( struct gl_context *ctx, GLenum target,
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-      r200SetTexMaxAnisotropy( t, texObj->MaxAnisotropy );
-      r200SetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
+      r200SetTexMaxAnisotropy( t, texObj->Sampler.MaxAnisotropy );
+      r200SetTexFilter( t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter );
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
    case GL_TEXTURE_WRAP_R:
-      r200SetTexWrap( t, texObj->WrapS, texObj->WrapT, texObj->WrapR );
+      r200SetTexWrap( t, texObj->Sampler.WrapS, texObj->Sampler.WrapT, texObj->Sampler.WrapR );
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
-      r200SetTexBorderColor( t, texObj->BorderColor.f );
+      r200SetTexBorderColor( t, texObj->Sampler.BorderColor.f );
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
@@ -479,13 +479,13 @@ static struct gl_texture_object *r200NewTextureObject(struct gl_context * ctx,
 	   _mesa_lookup_enum_by_nr(target), t);
 
    _mesa_initialize_texture_object(&t->base, name, target);
-   t->base.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
+   t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
 
    /* Initialize hardware state */
-   r200SetTexWrap( t, t->base.WrapS, t->base.WrapT, t->base.WrapR );
-   r200SetTexMaxAnisotropy( t, t->base.MaxAnisotropy );
-   r200SetTexFilter(t, t->base.MinFilter, t->base.MagFilter);
-   r200SetTexBorderColor(t, t->base.BorderColor.f);
+   r200SetTexWrap( t, t->base.Sampler.WrapS, t->base.Sampler.WrapT, t->base.Sampler.WrapR );
+   r200SetTexMaxAnisotropy( t, t->base.Sampler.MaxAnisotropy );
+   r200SetTexFilter(t, t->base.Sampler.MinFilter, t->base.Sampler.MagFilter);
+   r200SetTexBorderColor(t, t->base.Sampler.BorderColor.f);
 
    return &t->base;
 }
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 50cf8d6f9db..f0d960dca54 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -77,8 +77,8 @@ static void build_state(
 		if (fp->Base.ShadowSamplers & (1 << unit)) {
 			struct gl_texture_object* tex = r300->radeon.glCtx->Texture.Unit[unit]._Current;
 
-			state->unit[unit].texture_swizzle = build_dts(tex->DepthMode);
-			state->unit[unit].texture_compare_func = build_func(tex->CompareFunc);
+			state->unit[unit].texture_swizzle = build_dts(tex->Sampler.DepthMode);
+			state->unit[unit].texture_compare_func = build_func(tex->Sampler.CompareFunc);
 		}
 	}
 }
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 51989c6b224..da6c8b602e1 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1343,7 +1343,7 @@ static void r300SetupTextures(struct gl_context * ctx)
 			 */
 			r300->hw.tex.filter_1.cmd[R300_TEX_VALUE_0 + hw_tmu] =
 				t->pp_txfilter_1 |
-				translate_lod_bias(ctx->Texture.Unit[i].LodBias + t->base.LodBias);
+				translate_lod_bias(ctx->Texture.Unit[i].LodBias + t->base.Sampler.LodBias);
 			r300->hw.tex.size.cmd[R300_TEX_VALUE_0 + hw_tmu] =
 			    t->pp_txsize;
 			r300->hw.tex.format.cmd[R300_TEX_VALUE_0 +
@@ -2014,7 +2014,7 @@ static const GLfloat *get_fragmentprogram_constant(struct gl_context *ctx, GLuin
 				buffer[0] =
 				buffer[1] =
 				buffer[2] =
-				buffer[3] = texObj->CompareFailValue;
+				buffer[3] = texObj->Sampler.CompareFailValue;
 			}
 			return buffer;
 		}
diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index f930b4d06bf..590d9afe14a 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -81,13 +81,13 @@ static void r300UpdateTexWrap(radeonTexObjPtr t)
 	t->pp_txfilter &=
 	    ~(R300_TX_WRAP_S_MASK | R300_TX_WRAP_T_MASK | R300_TX_WRAP_R_MASK);
 
-	t->pp_txfilter |= translate_wrap_mode(tObj->WrapS) << R300_TX_WRAP_S_SHIFT;
+	t->pp_txfilter |= translate_wrap_mode(tObj->Sampler.WrapS) << R300_TX_WRAP_S_SHIFT;
 
 	if (tObj->Target != GL_TEXTURE_1D) {
-		t->pp_txfilter |= translate_wrap_mode(tObj->WrapT) << R300_TX_WRAP_T_SHIFT;
+		t->pp_txfilter |= translate_wrap_mode(tObj->Sampler.WrapT) << R300_TX_WRAP_T_SHIFT;
 
 		if (tObj->Target == GL_TEXTURE_3D)
-			t->pp_txfilter |= translate_wrap_mode(tObj->WrapR) << R300_TX_WRAP_R_SHIFT;
+			t->pp_txfilter |= translate_wrap_mode(tObj->Sampler.WrapR) << R300_TX_WRAP_R_SHIFT;
 	}
 }
 
@@ -202,7 +202,7 @@ static void r300TexParameter(struct gl_context * ctx, GLenum target,
 	case GL_TEXTURE_MIN_FILTER:
 	case GL_TEXTURE_MAG_FILTER:
 	case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-		r300SetTexFilter(t, texObj->MinFilter, texObj->MagFilter, texObj->MaxAnisotropy);
+		r300SetTexFilter(t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter, texObj->Sampler.MaxAnisotropy);
 		break;
 
 	case GL_TEXTURE_WRAP_S:
@@ -212,7 +212,7 @@ static void r300TexParameter(struct gl_context * ctx, GLenum target,
 		break;
 
 	case GL_TEXTURE_BORDER_COLOR:
-		r300SetTexBorderColor(t, texObj->BorderColor.f);
+		r300SetTexBorderColor(t, texObj->Sampler.BorderColor.f);
 		break;
 
 	case GL_TEXTURE_BASE_LEVEL:
@@ -299,12 +299,14 @@ static struct gl_texture_object *r300NewTextureObject(struct gl_context * ctx,
 	}
 
 	_mesa_initialize_texture_object(&t->base, name, target);
-	t->base.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
+	t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
 
 	/* Initialize hardware state */
 	r300UpdateTexWrap(t);
-	r300SetTexFilter(t, t->base.MinFilter, t->base.MagFilter, t->base.MaxAnisotropy);
-	r300SetTexBorderColor(t, t->base.BorderColor.f);
+	r300SetTexFilter(t, t->base.Sampler.MinFilter,
+                         t->base.Sampler.MagFilter,
+                         t->base.Sampler.MaxAnisotropy);
+	r300SetTexBorderColor(t, t->base.Sampler.BorderColor.f);
 
 	return &t->base;
 }
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index ed9955b05d8..e24ad6f088d 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -216,7 +216,7 @@ void r300SetDepthTexMode(struct gl_texture_object *tObj)
 		return;
 	}
 
-	switch (tObj->DepthMode) {
+	switch (tObj->Sampler.DepthMode) {
 	case GL_LUMINANCE:
 		t->pp_txformat = format[0];
 		break;
diff --git a/src/mesa/drivers/dri/r600/evergreen_tex.c b/src/mesa/drivers/dri/r600/evergreen_tex.c
index 3b5448a0e4e..810f0e8b523 100644
--- a/src/mesa/drivers/dri/r600/evergreen_tex.c
+++ b/src/mesa/drivers/dri/r600/evergreen_tex.c
@@ -581,7 +581,7 @@ static GLboolean evergreenGetTexFormat(struct gl_texture_object *tObj, gl_format
 		default:
 			break;
 		};
-		switch (tObj->DepthMode) {
+		switch (tObj->Sampler.DepthMode) {
 		case GL_LUMINANCE:  /* X, X, X, ONE */
 			SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_X,
 				 SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_mask);
@@ -699,18 +699,18 @@ static void evergreenUpdateTexWrap(radeonTexObjPtr t)
 {
 	struct gl_texture_object *tObj = &t->base;
 
-    SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->WrapS),
+    SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->Sampler.WrapS),
              EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_X_shift, 
              EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_X_mask);
 
 	if (tObj->Target != GL_TEXTURE_1D) 
     {
-		SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->WrapT),
+		SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->Sampler.WrapT),
 			     EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_Y_shift, 
                  EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_Y_mask);
 
 		if (tObj->Target == GL_TEXTURE_3D)
-			SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->WrapR),
+			SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_wrap_mode(tObj->Sampler.WrapR),
 				     EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_Z_shift, 
                      EG_SQ_TEX_SAMPLER_WORD0_0__CLAMP_Z_mask);
 	}
@@ -1022,21 +1022,21 @@ static GLboolean evergreen_setup_hardware_state(struct gl_context * ctx, struct
 	SETfield(t->SQ_TEX_RESOURCE5, t->maxLod - t->minLod, LAST_LEVEL_shift, LAST_LEVEL_mask);
     
 	SETfield(t->SQ_TEX_SAMPLER1,
-		     EG_S_FIXED(CLAMP(t->base.MinLod - t->minLod, 0, 15), 8),
+		     EG_S_FIXED(CLAMP(t->base.Sampler.MinLod - t->minLod, 0, 15), 8),
 		     EG_SQ_TEX_SAMPLER_WORD1_0__MIN_LOD_shift, 
              EG_SQ_TEX_SAMPLER_WORD1_0__MIN_LOD_mask);
 	SETfield(t->SQ_TEX_SAMPLER1,
-		     EG_S_FIXED(CLAMP(t->base.MaxLod - t->minLod, 0, 15), 8),
+		     EG_S_FIXED(CLAMP(t->base.Sampler.MaxLod - t->minLod, 0, 15), 8),
 		     EG_SQ_TEX_SAMPLER_WORD1_0__MAX_LOD_shift, 
              EG_SQ_TEX_SAMPLER_WORD1_0__MAX_LOD_mask);
 	SETfield(t->SQ_TEX_SAMPLER2,
-		     EG_S_FIXED(CLAMP(ctx->Texture.Unit[unit].LodBias + t->base.LodBias, -16, 16), 8),
+		     EG_S_FIXED(CLAMP(ctx->Texture.Unit[unit].LodBias + t->base.Sampler.LodBias, -16, 16), 8),
 		     EG_SQ_TEX_SAMPLER_WORD2_0__LOD_BIAS_shift, 
              EG_SQ_TEX_SAMPLER_WORD2_0__LOD_BIAS_mask);
 
-	if(texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB)
+	if(texObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB)
 	{
-		SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_shadow_func(texObj->CompareFunc), 
+		SETfield(t->SQ_TEX_SAMPLER0, evergreen_translate_shadow_func(texObj->Sampler.CompareFunc), 
                  EG_SQ_TEX_SAMPLER_WORD0_0__DCF_shift, 
                  EG_SQ_TEX_SAMPLER_WORD0_0__DCF_mask);
 	}
@@ -1420,12 +1420,12 @@ static struct gl_texture_object *evergreenNewTextureObject(struct gl_context * c
 			t, _mesa_lookup_enum_by_nr(target));
 
 	_mesa_initialize_texture_object(&t->base, name, target);
-	t->base.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
+	t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
     
 	evergreenSetTexDefaultState(t);
 	evergreenUpdateTexWrap(t);
-	evergreenSetTexFilter(t, t->base.MinFilter, t->base.MagFilter, t->base.MaxAnisotropy);
-	evergreenSetTexBorderColor(t, t->base.BorderColor.f);
+	evergreenSetTexFilter(t, t->base.Sampler.MinFilter, t->base.Sampler.MagFilter, t->base.Sampler.MaxAnisotropy);
+	evergreenSetTexBorderColor(t, t->base.Sampler.BorderColor.f);
 
 	return &t->base;
 }
@@ -1475,7 +1475,7 @@ static void evergreenTexParameter(struct gl_context * ctx, GLenum target,
 	case GL_TEXTURE_MIN_FILTER:
 	case GL_TEXTURE_MAG_FILTER:
 	case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-		evergreenSetTexFilter(t, texObj->MinFilter, texObj->MagFilter, texObj->MaxAnisotropy);
+		evergreenSetTexFilter(t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter, texObj->Sampler.MaxAnisotropy);
 		break;
 
 	case GL_TEXTURE_WRAP_S:
@@ -1485,7 +1485,7 @@ static void evergreenTexParameter(struct gl_context * ctx, GLenum target,
 		break;
 
 	case GL_TEXTURE_BORDER_COLOR:
-		evergreenSetTexBorderColor(t, texObj->BorderColor.f);
+		evergreenSetTexBorderColor(t, texObj->Sampler.BorderColor.f);
 		break;
 
 	case GL_TEXTURE_BASE_LEVEL:
diff --git a/src/mesa/drivers/dri/r600/r600_tex.c b/src/mesa/drivers/dri/r600/r600_tex.c
index fe4f0e48661..eb7ed30c7a3 100644
--- a/src/mesa/drivers/dri/r600/r600_tex.c
+++ b/src/mesa/drivers/dri/r600/r600_tex.c
@@ -78,15 +78,15 @@ static void r600UpdateTexWrap(radeonTexObjPtr t)
 {
 	struct gl_texture_object *tObj = &t->base;
 
-        SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->WrapS),
+        SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->Sampler.WrapS),
                  SQ_TEX_SAMPLER_WORD0_0__CLAMP_X_shift, SQ_TEX_SAMPLER_WORD0_0__CLAMP_X_mask);
 
 	if (tObj->Target != GL_TEXTURE_1D) {
-		SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->WrapT),
+		SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->Sampler.WrapT),
 			 CLAMP_Y_shift, CLAMP_Y_mask);
 
 		if (tObj->Target == GL_TEXTURE_3D)
-			SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->WrapR),
+			SETfield(t->SQ_TEX_SAMPLER0, translate_wrap_mode(tObj->Sampler.WrapR),
 				 CLAMP_Z_shift, CLAMP_Z_mask);
 	}
 }
@@ -292,7 +292,7 @@ static void r600TexParameter(struct gl_context * ctx, GLenum target,
 	case GL_TEXTURE_MIN_FILTER:
 	case GL_TEXTURE_MAG_FILTER:
 	case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-		r600SetTexFilter(t, texObj->MinFilter, texObj->MagFilter, texObj->MaxAnisotropy);
+		r600SetTexFilter(t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter, texObj->Sampler.MaxAnisotropy);
 		break;
 
 	case GL_TEXTURE_WRAP_S:
@@ -302,7 +302,7 @@ static void r600TexParameter(struct gl_context * ctx, GLenum target,
 		break;
 
 	case GL_TEXTURE_BORDER_COLOR:
-		r600SetTexBorderColor(t, texObj->BorderColor.f);
+		r600SetTexBorderColor(t, texObj->Sampler.BorderColor.f);
 		break;
 
 	case GL_TEXTURE_BASE_LEVEL:
@@ -382,13 +382,13 @@ static struct gl_texture_object *r600NewTextureObject(struct gl_context * ctx,
 			t, _mesa_lookup_enum_by_nr(target));
 
 	_mesa_initialize_texture_object(&t->base, name, target);
-	t->base.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
+	t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
 
 	/* Initialize hardware state */
 	r600SetTexDefaultState(t);
 	r600UpdateTexWrap(t);
-	r600SetTexFilter(t, t->base.MinFilter, t->base.MagFilter, t->base.MaxAnisotropy);
-	r600SetTexBorderColor(t, t->base.BorderColor.f);
+	r600SetTexFilter(t, t->base.Sampler.MinFilter, t->base.Sampler.MagFilter, t->base.Sampler.MaxAnisotropy);
+	r600SetTexBorderColor(t, t->base.Sampler.BorderColor.f);
 
 	return &t->base;
 }
diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index aafa6875774..3568a5515be 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -571,7 +571,7 @@ static GLboolean r600GetTexFormat(struct gl_texture_object *tObj, gl_format mesa
 		default:
 			break;
 		};
-		switch (tObj->DepthMode) {
+		switch (tObj->Sampler.DepthMode) {
 		case GL_LUMINANCE:  /* X, X, X, ONE */
 			SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_X,
 				 SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_mask);
@@ -777,18 +777,18 @@ static GLboolean setup_hardware_state(struct gl_context * ctx, struct gl_texture
 	SETfield(t->SQ_TEX_RESOURCE5, t->maxLod - t->minLod, LAST_LEVEL_shift, LAST_LEVEL_mask);
 
 	SETfield(t->SQ_TEX_SAMPLER1,
-		S_FIXED(CLAMP(t->base.MinLod - t->minLod, 0, 15), 6),
+		S_FIXED(CLAMP(t->base.Sampler.MinLod - t->minLod, 0, 15), 6),
 		MIN_LOD_shift, MIN_LOD_mask);
 	SETfield(t->SQ_TEX_SAMPLER1,
-		S_FIXED(CLAMP(t->base.MaxLod - t->minLod, 0, 15), 6),
+		S_FIXED(CLAMP(t->base.Sampler.MaxLod - t->minLod, 0, 15), 6),
 		MAX_LOD_shift, MAX_LOD_mask);
 	SETfield(t->SQ_TEX_SAMPLER1,
-		S_FIXED(CLAMP(ctx->Texture.Unit[unit].LodBias + t->base.LodBias, -16, 16), 6),
+		S_FIXED(CLAMP(ctx->Texture.Unit[unit].LodBias + t->base.Sampler.LodBias, -16, 16), 6),
 		SQ_TEX_SAMPLER_WORD1_0__LOD_BIAS_shift, SQ_TEX_SAMPLER_WORD1_0__LOD_BIAS_mask);
 
-	if(texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB)
+	if(texObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB)
 	{
-		SETfield(t->SQ_TEX_SAMPLER0, r600_translate_shadow_func(texObj->CompareFunc), DEPTH_COMPARE_FUNCTION_shift, DEPTH_COMPARE_FUNCTION_mask);
+		SETfield(t->SQ_TEX_SAMPLER0, r600_translate_shadow_func(texObj->Sampler.CompareFunc), DEPTH_COMPARE_FUNCTION_shift, DEPTH_COMPARE_FUNCTION_mask);
 	}
 	else
 	{
diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index 1fadad2756b..03d9b264367 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -296,15 +296,15 @@ static void calculate_min_max_lod(struct gl_texture_object *tObj,
 	case GL_TEXTURE_2D:
 	case GL_TEXTURE_3D:
 	case GL_TEXTURE_CUBE_MAP:
-		if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+		if (tObj->Sampler.MinFilter == GL_NEAREST || tObj->Sampler.MinFilter == GL_LINEAR) {
 			/* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.
 			*/
 			minLod = maxLod = tObj->BaseLevel;
 		} else {
-			minLod = tObj->BaseLevel + (GLint)(tObj->MinLod);
+			minLod = tObj->BaseLevel + (GLint)(tObj->Sampler.MinLod);
 			minLod = MAX2(minLod, tObj->BaseLevel);
 			minLod = MIN2(minLod, tObj->MaxLevel);
-			maxLod = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);
+			maxLod = tObj->BaseLevel + (GLint)(tObj->Sampler.MaxLod + 0.5);
 			maxLod = MIN2(maxLod, tObj->MaxLevel);
 			maxLod = MIN2(maxLod, tObj->Image[0][minLod]->MaxLog2 + minLod);
 			maxLod = MAX2(maxLod, minLod); /* need at least one level */
diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c
index 8a35c7d2d27..25a8ddf7b6a 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex.c
@@ -330,17 +330,17 @@ static void radeonTexParameter( struct gl_context *ctx, GLenum target,
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-      radeonSetTexMaxAnisotropy( t, texObj->MaxAnisotropy );
-      radeonSetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
+      radeonSetTexMaxAnisotropy( t, texObj->Sampler.MaxAnisotropy );
+      radeonSetTexFilter( t, texObj->Sampler.MinFilter, texObj->Sampler.MagFilter );
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
-      radeonSetTexWrap( t, texObj->WrapS, texObj->WrapT );
+      radeonSetTexWrap( t, texObj->Sampler.WrapS, texObj->Sampler.WrapT );
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
-      radeonSetTexBorderColor( t, texObj->BorderColor.f );
+      radeonSetTexBorderColor( t, texObj->Sampler.BorderColor.f );
       break;
 
    case GL_TEXTURE_BASE_LEVEL:
@@ -416,7 +416,7 @@ radeonNewTextureObject( struct gl_context *ctx, GLuint name, GLenum target )
    radeonTexObj* t = CALLOC_STRUCT(radeon_tex_obj);
 
    _mesa_initialize_texture_object(&t->base, name, target);
-   t->base.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
+   t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy;
 
    t->border_fallback = GL_FALSE;
 
@@ -424,10 +424,10 @@ radeonNewTextureObject( struct gl_context *ctx, GLuint name, GLenum target )
    t->pp_txformat = (RADEON_TXFORMAT_ENDIAN_NO_SWAP |
 		     RADEON_TXFORMAT_PERSPECTIVE_ENABLE);
    
-   radeonSetTexWrap( t, t->base.WrapS, t->base.WrapT );
-   radeonSetTexMaxAnisotropy( t, t->base.MaxAnisotropy );
-   radeonSetTexFilter( t, t->base.MinFilter, t->base.MagFilter );
-   radeonSetTexBorderColor( t, t->base.BorderColor.f );
+   radeonSetTexWrap( t, t->base.Sampler.WrapS, t->base.Sampler.WrapT );
+   radeonSetTexMaxAnisotropy( t, t->base.Sampler.MaxAnisotropy );
+   radeonSetTexFilter( t, t->base.Sampler.MinFilter, t->base.Sampler.MagFilter );
+   radeonSetTexBorderColor( t, t->base.Sampler.BorderColor.f );
    return &t->base;
 }
 
diff --git a/src/mesa/drivers/dri/savage/savagerender.c b/src/mesa/drivers/dri/savage/savagerender.c
index 8cc448ad4f7..6687dc5f466 100644
--- a/src/mesa/drivers/dri/savage/savagerender.c
+++ b/src/mesa/drivers/dri/savage/savagerender.c
@@ -250,9 +250,9 @@ static GLboolean run_texnorm_stage( struct gl_context *ctx,
       const GLbitfield reallyEnabled = ctx->Texture.Unit[i]._ReallyEnabled;
       if (reallyEnabled) {
          const struct gl_texture_object *texObj = ctx->Texture.Unit[i]._Current;
-         const GLboolean normalizeS = (texObj->WrapS == GL_REPEAT);
+         const GLboolean normalizeS = (texObj->Sampler.WrapS == GL_REPEAT);
          const GLboolean normalizeT = (reallyEnabled & TEXTURE_2D_BIT) &&
-            (texObj->WrapT == GL_REPEAT);
+            (texObj->Sampler.WrapT == GL_REPEAT);
          const GLfloat *in = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]->data;
          const GLint instride = VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]->stride;
          GLfloat (*out)[4] = store->texcoord[i].data;
@@ -332,15 +332,15 @@ static void validate_texnorm( struct gl_context *ctx,
    GLuint flags = 0;
 
    if (((ctx->Texture.Unit[0]._ReallyEnabled & (TEXTURE_1D_BIT|TEXTURE_2D_BIT)) &&
-	(ctx->Texture.Unit[0]._Current->WrapS == GL_REPEAT)) ||
+	(ctx->Texture.Unit[0]._Current->Sampler.WrapS == GL_REPEAT)) ||
        ((ctx->Texture.Unit[0]._ReallyEnabled & TEXTURE_2D_BIT) &&
-	(ctx->Texture.Unit[0]._Current->WrapT == GL_REPEAT)))
+	(ctx->Texture.Unit[0]._Current->Sampler.WrapT == GL_REPEAT)))
       flags |= VERT_BIT_TEX0;
 
    if (((ctx->Texture.Unit[1]._ReallyEnabled & (TEXTURE_1D_BIT|TEXTURE_2D_BIT)) &&
-	(ctx->Texture.Unit[1]._Current->WrapS == GL_REPEAT)) ||
+	(ctx->Texture.Unit[1]._Current->Sampler.WrapS == GL_REPEAT)) ||
        ((ctx->Texture.Unit[1]._ReallyEnabled & TEXTURE_2D_BIT) &&
-	(ctx->Texture.Unit[1]._Current->WrapT == GL_REPEAT)))
+	(ctx->Texture.Unit[1]._Current->Sampler.WrapT == GL_REPEAT)))
       flags |= VERT_BIT_TEX1;
 
    store->active = (flags != 0);
diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index 3aece732c99..9486c12c158 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -502,9 +502,9 @@ savageAllocTexObj( struct gl_texture_object *texObj )
   
       make_empty_list( &t->base );
 
-      savageSetTexWrapping(t,texObj->WrapS,texObj->WrapT);
-      savageSetTexFilter(t,texObj->MinFilter,texObj->MagFilter);
-      savageSetTexBorderColor(t,texObj->BorderColor.f);
+      savageSetTexWrapping(t,texObj->Sampler.WrapS,texObj->Sampler.WrapT);
+      savageSetTexFilter(t,texObj->Sampler.MinFilter,texObj->Sampler.MagFilter);
+      savageSetTexBorderColor(t,texObj->Sampler.BorderColor.f);
    }
 
    return t;
@@ -2031,16 +2031,16 @@ static void savageTexParameter( struct gl_context *ctx, GLenum target,
    switch (pname) {
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
-      savageSetTexFilter(t,tObj->MinFilter,tObj->MagFilter);
+      savageSetTexFilter(t,tObj->Sampler.MinFilter,tObj->Sampler.MagFilter);
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
-      savageSetTexWrapping(t,tObj->WrapS,tObj->WrapT);
+      savageSetTexWrapping(t,tObj->Sampler.WrapS,tObj->Sampler.WrapT);
       break;
   
    case GL_TEXTURE_BORDER_COLOR:
-      savageSetTexBorderColor(t,tObj->BorderColor.f);
+      savageSetTexBorderColor(t,tObj->Sampler.BorderColor.f);
       break;
 
    default:
diff --git a/src/mesa/drivers/dri/sis/sis_texstate.c b/src/mesa/drivers/dri/sis/sis_texstate.c
index daec2393211..6580f155bae 100644
--- a/src/mesa/drivers/dri/sis/sis_texstate.c
+++ b/src/mesa/drivers/dri/sis/sis_texstate.c
@@ -335,7 +335,7 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
    current->texture[hw_unit].hwTextureMip = 0UL;
    current->texture[hw_unit].hwTextureSet = t->hwformat;
 
-   if ((texObj->MinFilter == GL_NEAREST) || (texObj->MinFilter == GL_LINEAR)) {
+   if ((texObj->Sampler.MinFilter == GL_NEAREST) || (texObj->Sampler.MinFilter == GL_LINEAR)) {
       firstLevel = lastLevel = texObj->BaseLevel;
    } else {
       /* Compute which mipmap levels we really want to send to the hardware.
@@ -344,9 +344,9 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
        * Yes, this looks overly complicated, but it's all needed.
        */
 
-      firstLevel = texObj->BaseLevel + (GLint)(texObj->MinLod + 0.5);
+      firstLevel = texObj->BaseLevel + (GLint)(texObj->Sampler.MinLod + 0.5);
       firstLevel = MAX2(firstLevel, texObj->BaseLevel);
-      lastLevel = texObj->BaseLevel + (GLint)(texObj->MaxLod + 0.5);
+      lastLevel = texObj->BaseLevel + (GLint)(texObj->Sampler.MaxLod + 0.5);
       lastLevel = MAX2(lastLevel, texObj->BaseLevel);
       lastLevel = MIN2(lastLevel, texObj->BaseLevel +
          texObj->Image[0][texObj->BaseLevel]->MaxLog2);
@@ -356,7 +356,7 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
 
    current->texture[hw_unit].hwTextureSet |= (lastLevel << 8);
 
-   switch (texObj->MagFilter)
+   switch (texObj->Sampler.MagFilter)
    {
    case GL_NEAREST:
       current->texture[hw_unit].hwTextureMip |= TEXTURE_FILTER_NEAREST;
@@ -382,7 +382,7 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
          MASK_TextureMipmapLodBias);
    }
 
-   switch (texObj->MinFilter)
+   switch (texObj->Sampler.MinFilter)
    {
    case GL_NEAREST:
       current->texture[hw_unit].hwTextureMip |= TEXTURE_FILTER_NEAREST;
@@ -408,7 +408,7 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
       break;
    }
 
-   switch (texObj->WrapS)
+   switch (texObj->Sampler.WrapS)
    {
    case GL_REPEAT:
       current->texture[hw_unit].hwTextureSet |= MASK_TextureWrapU;
@@ -431,7 +431,7 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
       break;
    }
 
-   switch (texObj->WrapT)
+   switch (texObj->Sampler.WrapT)
    {
    case GL_REPEAT:
       current->texture[hw_unit].hwTextureSet |= MASK_TextureWrapV;
@@ -456,10 +456,10 @@ sis_set_texobj_parm( struct gl_context *ctx, struct gl_texture_object *texObj,
 
    {
       GLubyte c[4];
-      CLAMPED_FLOAT_TO_UBYTE(c[0], texObj->BorderColor.f[0]);
-      CLAMPED_FLOAT_TO_UBYTE(c[1], texObj->BorderColor.f[1]);
-      CLAMPED_FLOAT_TO_UBYTE(c[2], texObj->BorderColor.f[2]);
-      CLAMPED_FLOAT_TO_UBYTE(c[3], texObj->BorderColor.f[3]);
+      CLAMPED_FLOAT_TO_UBYTE(c[0], texObj->Sampler.BorderColor.f[0]);
+      CLAMPED_FLOAT_TO_UBYTE(c[1], texObj->Sampler.BorderColor.f[1]);
+      CLAMPED_FLOAT_TO_UBYTE(c[2], texObj->Sampler.BorderColor.f[2]);
+      CLAMPED_FLOAT_TO_UBYTE(c[3], texObj->Sampler.BorderColor.f[3]);
 
       current->texture[hw_unit].hwTextureBorderColor = 
          PACK_COLOR_8888(c[3], c[0], c[1], c[2]);
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 4cca243d076..d74ddb24005 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -327,7 +327,7 @@ static void RevalidateTexture(struct gl_context *ctx, struct gl_texture_object *
                       &(ti->sScale), &(ti->tScale), NULL, NULL);
     }
 
-    if (tObj->Image[0][maxl] && (tObj->MinFilter != GL_NEAREST) && (tObj->MinFilter != GL_LINEAR)) {
+    if (tObj->Image[0][maxl] && (tObj->Sampler.MinFilter != GL_NEAREST) && (tObj->Sampler.MinFilter != GL_LINEAR)) {
         /* mipmapping: need to compute smallLodLog2 */
         tdfxTexGetInfo(ctx, tObj->Image[0][maxl]->Width,
                        tObj->Image[0][maxl]->Height,
@@ -1786,12 +1786,12 @@ tdfxTestProxyTexImage(struct gl_context *ctx, GLenum target,
 #endif
             if (level == 0) {
                /* don't use mipmap levels > 0 */
-               tObj->MinFilter = tObj->MagFilter = GL_NEAREST;
+               tObj->Sampler.MinFilter = tObj->Sampler.MagFilter = GL_NEAREST;
             }
             else {
                /* test with all mipmap levels */
-               tObj->MinFilter = GL_LINEAR_MIPMAP_LINEAR;
-               tObj->MagFilter = GL_NEAREST;
+               tObj->Sampler.MinFilter = GL_LINEAR_MIPMAP_LINEAR;
+               tObj->Sampler.MagFilter = GL_NEAREST;
             }
             RevalidateTexture(ctx, tObj);
 
diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 774f439bfb6..3b270e02a97 100644
--- a/src/mesa/drivers/dri/unichrome/via_state.c
+++ b/src/mesa/drivers/dri/unichrome/via_state.c
@@ -877,21 +877,21 @@ static GLboolean viaChooseTextureState(struct gl_context *ctx)
         if (texUnit0->_ReallyEnabled) {
             struct gl_texture_object *texObj = texUnit0->_Current;
    
-	    vmesa->regHTXnTB[0] = get_minmag_filter( texObj->MinFilter,
-						    texObj->MagFilter );
+	    vmesa->regHTXnTB[0] = get_minmag_filter( texObj->Sampler.MinFilter,
+						    texObj->Sampler.MagFilter );
 
 	    vmesa->regHTXnMPMD[0] &= ~(HC_HTXnMPMD_SMASK | HC_HTXnMPMD_TMASK);
-	    vmesa->regHTXnMPMD[0] |= get_wrap_mode( texObj->WrapS,
-						   texObj->WrapT );
+	    vmesa->regHTXnMPMD[0] |= get_wrap_mode( texObj->Sampler.WrapS,
+						   texObj->Sampler.WrapT );
 
 	    vmesa->regHTXnTB[0] &= ~(HC_HTXnTB_TBC_S | HC_HTXnTB_TBC_T);
             if (texObj->Image[0][texObj->BaseLevel]->Border > 0) {
 	       vmesa->regHTXnTB[0] |= (HC_HTXnTB_TBC_S | HC_HTXnTB_TBC_T);
 	       vmesa->regHTXnTBC[0] = 
-		  PACK_COLOR_888(FLOAT_TO_UBYTE(texObj->BorderColor.f[0]),
-				 FLOAT_TO_UBYTE(texObj->BorderColor.f[1]),
-				 FLOAT_TO_UBYTE(texObj->BorderColor.f[2]));
-	       vmesa->regHTXnTRAH[0] = FLOAT_TO_UBYTE(texObj->BorderColor.f[3]);
+		  PACK_COLOR_888(FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[0]),
+				 FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[1]),
+				 FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[2]));
+	       vmesa->regHTXnTRAH[0] = FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[3]);
             }
 
 	    if (texUnit0->LodBias != 0.0f) {
@@ -911,20 +911,20 @@ static GLboolean viaChooseTextureState(struct gl_context *ctx)
         if (texUnit1->_ReallyEnabled) {
             struct gl_texture_object *texObj = texUnit1->_Current;
 
-	    vmesa->regHTXnTB[1] = get_minmag_filter( texObj->MinFilter,
-						    texObj->MagFilter );
+	    vmesa->regHTXnTB[1] = get_minmag_filter( texObj->Sampler.MinFilter,
+						    texObj->Sampler.MagFilter );
 	    vmesa->regHTXnMPMD[1] &= ~(HC_HTXnMPMD_SMASK | HC_HTXnMPMD_TMASK);
-	    vmesa->regHTXnMPMD[1] |= get_wrap_mode( texObj->WrapS,
-						   texObj->WrapT );
+	    vmesa->regHTXnMPMD[1] |= get_wrap_mode( texObj->Sampler.WrapS,
+						   texObj->Sampler.WrapT );
 
 	    vmesa->regHTXnTB[1] &= ~(HC_HTXnTB_TBC_S | HC_HTXnTB_TBC_T);
             if (texObj->Image[0][texObj->BaseLevel]->Border > 0) {
 	       vmesa->regHTXnTB[1] |= (HC_HTXnTB_TBC_S | HC_HTXnTB_TBC_T);
 	       vmesa->regHTXnTBC[1] = 
-		  PACK_COLOR_888(FLOAT_TO_UBYTE(texObj->BorderColor.f[0]),
-				 FLOAT_TO_UBYTE(texObj->BorderColor.f[1]),
-				 FLOAT_TO_UBYTE(texObj->BorderColor.f[2]));
-	       vmesa->regHTXnTRAH[1] = FLOAT_TO_UBYTE(texObj->BorderColor.f[3]);
+		  PACK_COLOR_888(FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[0]),
+				 FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[1]),
+				 FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[2]));
+	       vmesa->regHTXnTRAH[1] = FLOAT_TO_UBYTE(texObj->Sampler.BorderColor.f[3]);
             }
 
 
diff --git a/src/mesa/drivers/dri/unichrome/via_tex.c b/src/mesa/drivers/dri/unichrome/via_tex.c
index a2fb010e142..1a0d1eaf070 100644
--- a/src/mesa/drivers/dri/unichrome/via_tex.c
+++ b/src/mesa/drivers/dri/unichrome/via_tex.c
@@ -495,13 +495,13 @@ static GLboolean viaSetTexImages(struct gl_context *ctx,
     * GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, and GL_TEXTURE_MAX_LEVEL.
     * Yes, this looks overly complicated, but it's all needed.
     */
-   if (texObj->MinFilter == GL_LINEAR || texObj->MinFilter == GL_NEAREST) {
+   if (texObj->Sampler.MinFilter == GL_LINEAR || texObj->Sampler.MinFilter == GL_NEAREST) {
       firstLevel = lastLevel = texObj->BaseLevel;
    }
    else {
-      firstLevel = texObj->BaseLevel + (GLint)(texObj->MinLod + 0.5);
+      firstLevel = texObj->BaseLevel + (GLint)(texObj->Sampler.MinLod + 0.5);
       firstLevel = MAX2(firstLevel, texObj->BaseLevel);
-      lastLevel = texObj->BaseLevel + (GLint)(texObj->MaxLod + 0.5);
+      lastLevel = texObj->BaseLevel + (GLint)(texObj->Sampler.MaxLod + 0.5);
       lastLevel = MAX2(lastLevel, texObj->BaseLevel);
       lastLevel = MIN2(lastLevel, texObj->BaseLevel + baseImage->image.MaxLog2);
       lastLevel = MIN2(lastLevel, texObj->MaxLevel);
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 91cdea5bb98..d0298df20cb 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -78,6 +78,9 @@
 #include "polygon.h"
 #include "queryobj.h"
 #include "readpix.h"
+#if FEATURE_ARB_sampler_objects
+#include "samplerobj.h"
+#endif
 #include "scissor.h"
 #include "stencil.h"
 #include "texenv.h"
@@ -729,6 +732,10 @@ _mesa_create_exec_table(void)
    /* GL_ARB_texture_buffer_object */
    SET_TexBufferARB(exec, _mesa_TexBuffer);
 
+#if FEATURE_ARB_sampler_objects
+   _mesa_init_sampler_object_dispatch(exec);
+#endif
+
    return exec;
 }
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 6a2f4870db9..57310040235 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -770,6 +770,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
       /* Restore texture object state for each target */
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
          const struct gl_texture_object *obj = NULL;
+         const struct gl_sampler_object *samp;
          GLenum target;
 
          obj = &texstate->SavedObj[u][tgt];
@@ -797,26 +798,28 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
 
          _mesa_BindTexture(target, obj->Name);
 
-         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor.f);
+         samp = &obj->Sampler;
+
+         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, samp->BorderColor.f);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, samp->WrapS);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, samp->WrapT);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, samp->WrapR);
+         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, samp->MinFilter);
+         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, samp->MagFilter);
+         _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, samp->MinLod);
+         _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, samp->MaxLod);
+         _mesa_TexParameterf(target, GL_TEXTURE_LOD_BIAS, samp->LodBias);
          _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, obj->WrapR);
-         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, obj->MinFilter);
-         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, obj->MagFilter);
-         _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod);
-         _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod);
-         _mesa_TexParameterf(target, GL_TEXTURE_LOD_BIAS, obj->LodBias);
          _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel);
          if (target != GL_TEXTURE_RECTANGLE_ARB)
             _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);
          if (ctx->Extensions.EXT_texture_filter_anisotropic) {
             _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,
-                                obj->MaxAnisotropy);
+                                samp->MaxAnisotropy);
          }
          if (ctx->Extensions.ARB_shadow_ambient) {
             _mesa_TexParameterf(target, GL_TEXTURE_COMPARE_FAIL_VALUE_ARB,
-                                obj->CompareFailValue);
+                                samp->CompareFailValue);
          }
       }
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 34d67b5bac8..d749b245e13 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1021,6 +1021,14 @@ struct dd_function_table {
     * \name GL_NV_texture_barrier interface
     */
    void (*TextureBarrier)(struct gl_context *ctx);
+
+   /**
+    * \name GL_ARB_sampler_objects
+    */
+   struct gl_sampler_object * (*NewSamplerObject)(struct gl_context *ctx,
+                                                  GLuint name);
+   void (*DeleteSamplerObject)(struct gl_context *ctx,
+                               struct gl_sampler_object *samp);
 };
 
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 7e86f1d0ed0..f66082e7fce 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -49,6 +49,7 @@
 #include "eval.h"
 #include "framebuffer.h"
 #include "glapi/glapi.h"
+#include "glapidispatch.h"
 #include "hash.h"
 #include "image.h"
 #include "light.h"
@@ -437,6 +438,9 @@ typedef enum
    /* GL_NV_texture_barrier */
    OPCODE_TEXTURE_BARRIER_NV,
 
+   /* GL_ARB_sampler_object */
+   OPCODE_BIND_SAMPLER,
+
    /* The following three are meta instructions */
    OPCODE_ERROR,                /* raise compiled-in error */
    OPCODE_CONTINUE,
@@ -7066,6 +7070,24 @@ save_TextureBarrierNV(void)
 }
 
 
+/* GL_ARB_sampler_objects */
+static void
+save_BindSampler(GLuint unit, GLuint sampler)
+{
+   Node *n;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_BIND_SAMPLER, 2);
+   if (n) {
+      n[1].ui = unit;
+      n[2].ui = sampler;
+   }
+   if (ctx->ExecuteFlag) {
+      CALL_BindSampler(ctx->Exec, (unit, sampler));
+   }
+}
+
+
 /**
  * Save an error-generating command into display list.
  *
@@ -8249,6 +8271,10 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_TextureBarrierNV(ctx->Exec, ());
             break;
 
+         case OPCODE_BIND_SAMPLER:
+            CALL_BindSampler(ctx->Exec, (n[1].ui, n[2].ui));
+            break;
+
          case OPCODE_CONTINUE:
             n = (Node *) n[1].next;
             break;
@@ -9930,6 +9956,9 @@ _mesa_create_save_table(void)
    /* GL_NV_texture_barrier */
    SET_TextureBarrierNV(table, save_TextureBarrierNV);
 
+   /* GL_ARB_sampler_objects */
+   SET_BindSampler(table, save_BindSampler);
+
    /* GL_ARB_draw_buffer_blend */
    SET_BlendFunciARB(table, save_BlendFunci);
    SET_BlendFuncSeparateiARB(table, save_BlendFuncSeparatei);
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index f57ad2f1384..98cbbf53b85 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1746,6 +1746,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SAMPLER_2D_SHADOW\0"
    "GL_SAMPLER_3D\0"
    "GL_SAMPLER_3D_OES\0"
+   "GL_SAMPLER_BINDING\0"
    "GL_SAMPLER_BUFFER\0"
    "GL_SAMPLER_BUFFER_EXT\0"
    "GL_SAMPLER_CUBE\0"
@@ -2344,7 +2345,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2305] =
+static const enum_elt all_enums[2306] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -4055,620 +4056,621 @@ static const enum_elt all_enums[2305] =
    { 37768, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
    { 37789, 0x00008B5F }, /* GL_SAMPLER_3D */
    { 37803, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 37821, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 37839, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 37861, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 37877, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 37900, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 37927, 0x000080A9 }, /* GL_SAMPLES */
-   { 37938, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 37954, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 37969, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 37987, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 38009, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38037, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38069, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38092, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38119, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38137, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38160, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38182, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 38201, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 38224, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 38250, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 38280, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 38305, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 38334, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 38349, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 38364, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 38380, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 38405, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 38445, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 38489, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 38522, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 38552, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 38584, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 38614, 0x00001C02 }, /* GL_SELECT */
-   { 38624, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 38652, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 38677, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 38693, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 38713, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 38737, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 38764, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 38795, 0x0000150F }, /* GL_SET */
-   { 38802, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 38827, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 38846, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 38867, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 38891, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 38906, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 38921, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 38949, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 38972, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 39002, 0x00001601 }, /* GL_SHININESS */
-   { 39015, 0x00001402 }, /* GL_SHORT */
-   { 39024, 0x00009119 }, /* GL_SIGNALED */
-   { 39036, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39057, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39073, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39093, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39112, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39126, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39141, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39163, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39183, 0x00001D01 }, /* GL_SMOOTH */
-   { 39193, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 39226, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 39253, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 39286, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 39313, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 39330, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 39351, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 39372, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 39387, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 39406, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 39425, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 39442, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 39463, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 39484, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 39499, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 39518, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 39537, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 39554, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 39575, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 39596, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 39611, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 39630, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 39649, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 39669, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 39687, 0x00001202 }, /* GL_SPECULAR */
-   { 39699, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 39713, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 39728, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 39746, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 39763, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 39777, 0x00008580 }, /* GL_SRC0_RGB */
-   { 39789, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 39803, 0x00008581 }, /* GL_SRC1_RGB */
-   { 39815, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 39829, 0x00008582 }, /* GL_SRC2_RGB */
-   { 39841, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 39854, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 39876, 0x00000300 }, /* GL_SRC_COLOR */
-   { 39889, 0x00008C40 }, /* GL_SRGB */
-   { 39897, 0x00008C41 }, /* GL_SRGB8 */
-   { 39906, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 39922, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 39936, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 39954, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 39973, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 39988, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 40007, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 40022, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40041, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40056, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40075, 0x00001802 }, /* GL_STENCIL */
-   { 40086, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40108, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40134, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40160, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40181, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 40206, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 40227, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 40252, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 40284, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 40320, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 40352, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 40388, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 40408, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 40435, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 40461, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 40477, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 40495, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 40517, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 40540, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 40556, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 40572, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 40589, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 40607, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 40626, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 40649, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 40671, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 40693, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 40711, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 40733, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 40755, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 40773, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 40795, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 40817, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 40838, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 40865, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 40892, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 40907, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 40923, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 40952, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 40974, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 40995, 0x00000C33 }, /* GL_STEREO */
-   { 41005, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 41029, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41054, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41078, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41093, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41112, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41127, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41146, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41161, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41180, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41197, 0x000084E7 }, /* GL_SUBTRACT */
-   { 41209, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 41225, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 41243, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 41257, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 41271, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 41298, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 41328, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 41343, 0x00002001 }, /* GL_T */
-   { 41348, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 41363, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 41382, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 41398, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 41413, 0x00002A27 }, /* GL_T2F_V3F */
-   { 41424, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 41443, 0x00002A28 }, /* GL_T4F_V4F */
-   { 41454, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 41477, 0x00001702 }, /* GL_TEXTURE */
-   { 41488, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 41500, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 41516, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 41528, 0x000084CA }, /* GL_TEXTURE10 */
-   { 41541, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 41558, 0x000084CB }, /* GL_TEXTURE11 */
-   { 41571, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 41588, 0x000084CC }, /* GL_TEXTURE12 */
-   { 41601, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 41618, 0x000084CD }, /* GL_TEXTURE13 */
-   { 41631, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 41648, 0x000084CE }, /* GL_TEXTURE14 */
-   { 41661, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 41678, 0x000084CF }, /* GL_TEXTURE15 */
-   { 41691, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 41708, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 41721, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 41738, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 41751, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 41768, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 41781, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 41798, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 41811, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 41828, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 41844, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 41856, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 41869, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 41886, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 41899, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 41916, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 41929, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 41946, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 41959, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 41976, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 41989, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 42006, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 42019, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42036, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42049, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42066, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42079, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42096, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42109, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42126, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42139, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42156, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42172, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42184, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42197, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 42214, 0x000084DF }, /* GL_TEXTURE31 */
-   { 42227, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 42244, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 42260, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 42272, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 42288, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 42300, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 42316, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 42328, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 42344, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 42356, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 42372, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 42384, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 42400, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 42412, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 42428, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 42442, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 42462, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 42486, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 42500, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 42520, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 42544, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 42558, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 42576, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 42598, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 42624, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 42646, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 42668, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 42696, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 42728, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 42750, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 42778, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 42810, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 42832, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 42858, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 42884, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 42914, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 42942, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 42974, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 43006, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 43035, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43068, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43100, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43115, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43136, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43161, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 43179, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 43203, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 43221, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 43243, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 43280, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 43321, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 43346, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 43375, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 43406, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 43436, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 43466, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 43501, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 43532, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 43570, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 43597, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 43629, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 43663, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 43687, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 43715, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 43739, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 43767, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 43800, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 43824, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 43846, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 43868, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 43894, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 43928, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 43961, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 43998, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 44026, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 44058, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 44081, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 44119, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44161, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 44192, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 44220, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 44250, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 44278, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 44303, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 44323, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 44347, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 44378, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 44413, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 44448, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 44479, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 44514, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 44549, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 44580, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 44615, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 44650, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 44674, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 44705, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 44740, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 44775, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 44806, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 44841, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 44876, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 44907, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 44942, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 44977, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 45006, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 45023, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 45045, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 45071, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 45086, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 45107, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 45127, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 45153, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 45183, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 45203, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 45227, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 45244, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 45261, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 45278, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 45301, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 45318, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 45343, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 45365, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 45391, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 45409, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 45435, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 45461, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 45491, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 45518, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 45543, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 45563, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 45587, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 45614, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 45641, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 45668, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 45694, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 45724, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 45746, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 45764, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 45804, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 45834, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 45862, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 45890, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 45918, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 45939, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 45958, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 45980, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 45999, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 46019, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 46049, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 46080, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 46101, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 46126, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 46150, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 46170, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 46194, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 46214, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 46237, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 46260, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 46284, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 46312, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 46342, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 46367, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 46401, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 46418, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 46436, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 46458, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 46476, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 46494, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 46513, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 46533, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 46552, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 46581, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 46598, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 46620, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 46650, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 46679, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 46715, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 46752, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 46793, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 46826, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 46860, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 46898, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 46934, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 46968, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 47006, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 47041, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 47080, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 47121, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 47166, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 47197, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 47232, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 47273, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 47318, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 47344, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 47374, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 47406, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 47436, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 47470, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 47486, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 47517, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 47552, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 47580, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 47612, 0x00000004 }, /* GL_TRIANGLES */
-   { 47625, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 47648, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 47675, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 47691, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 47712, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 47730, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 47758, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 47790, 0x00000001 }, /* GL_TRUE */
-   { 47798, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 47817, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 47837, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 47860, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 47880, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 47901, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 47923, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 47945, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 47965, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 47986, 0x00009118 }, /* GL_UNSIGNALED */
-   { 48000, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 48017, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 48044, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 48067, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 48083, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 48115, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 48142, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 48173, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 48194, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 48219, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 48243, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 48268, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 48299, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 48334, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 48362, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 48386, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 48414, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 48441, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 48474, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 48511, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 48542, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 48569, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 48602, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 48639, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 48670, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 48702, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 48738, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 48765, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 48796, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 48827, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 48862, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 48891, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 48924, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 48945, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 48970, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 48991, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 49016, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 49037, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 49062, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 49085, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 49103, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 49133, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 49167, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 49193, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 49223, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 49257, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 49283, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 49307, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 49335, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 49363, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 49390, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 49422, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 49453, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 49467, 0x00002A20 }, /* GL_V2F */
-   { 49474, 0x00002A21 }, /* GL_V3F */
-   { 49481, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 49500, 0x00001F00 }, /* GL_VENDOR */
-   { 49510, 0x00001F02 }, /* GL_VERSION */
-   { 49521, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 49537, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 49561, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 49591, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 49622, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 49657, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 49681, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 49702, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 49725, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 49746, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 49773, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 49801, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 49829, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 49857, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 49885, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 49913, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 49941, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 49968, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 49995, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 50022, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 50049, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 50076, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 50103, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 50130, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 50157, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 50184, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 50222, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 50264, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 50299, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 50330, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 50365, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 50396, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 50431, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 50465, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 50503, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 50534, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 50569, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 50597, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 50629, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 50659, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 50693, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 50721, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 50753, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 50773, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 50795, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 50824, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 50845, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 50874, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 50907, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 50939, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 50966, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 50997, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 51027, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 51044, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 51065, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 51092, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 51104, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 51120, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 51138, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 51153, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 51173, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 51204, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 51239, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 51274, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 51294, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 51322, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 51350, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 51375, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 51400, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 51427, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 51454, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 51479, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 51504, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 51528, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 51547, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 51561, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 51579, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 51597, 0x00001506 }, /* GL_XOR */
-   { 51604, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 51623, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 51637, 0x00000000 }, /* GL_ZERO */
-   { 51645, 0x00000D16 }, /* GL_ZOOM_X */
-   { 51655, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 37821, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 37840, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 37858, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 37880, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 37896, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 37919, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 37946, 0x000080A9 }, /* GL_SAMPLES */
+   { 37957, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 37973, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 37988, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 38006, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 38028, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 38056, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 38088, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 38111, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 38138, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 38156, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 38179, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 38201, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 38220, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 38243, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 38269, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 38299, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 38324, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 38353, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 38368, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 38383, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 38399, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 38424, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 38464, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 38508, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 38541, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 38571, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 38603, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 38633, 0x00001C02 }, /* GL_SELECT */
+   { 38643, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 38671, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 38696, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 38712, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 38732, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 38756, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 38783, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 38814, 0x0000150F }, /* GL_SET */
+   { 38821, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 38846, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 38865, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 38886, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 38910, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 38925, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 38940, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 38968, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 38991, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 39021, 0x00001601 }, /* GL_SHININESS */
+   { 39034, 0x00001402 }, /* GL_SHORT */
+   { 39043, 0x00009119 }, /* GL_SIGNALED */
+   { 39055, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 39076, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 39092, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 39112, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 39131, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 39145, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 39160, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 39182, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 39202, 0x00001D01 }, /* GL_SMOOTH */
+   { 39212, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 39245, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 39272, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 39305, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 39332, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 39349, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 39370, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 39391, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 39406, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 39425, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 39444, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 39461, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 39482, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 39503, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 39518, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 39537, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 39556, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 39573, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 39594, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 39615, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 39630, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 39649, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 39668, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 39688, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 39706, 0x00001202 }, /* GL_SPECULAR */
+   { 39718, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 39732, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 39747, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 39765, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 39782, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 39796, 0x00008580 }, /* GL_SRC0_RGB */
+   { 39808, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 39822, 0x00008581 }, /* GL_SRC1_RGB */
+   { 39834, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 39848, 0x00008582 }, /* GL_SRC2_RGB */
+   { 39860, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 39873, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 39895, 0x00000300 }, /* GL_SRC_COLOR */
+   { 39908, 0x00008C40 }, /* GL_SRGB */
+   { 39916, 0x00008C41 }, /* GL_SRGB8 */
+   { 39925, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 39941, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 39955, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 39973, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 39992, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 40007, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 40026, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 40041, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 40060, 0x000088E5 }, /* GL_STATIC_READ */
+   { 40075, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 40094, 0x00001802 }, /* GL_STENCIL */
+   { 40105, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 40127, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 40153, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 40179, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 40200, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 40225, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 40246, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 40271, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 40303, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 40339, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 40371, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 40407, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 40427, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 40454, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 40480, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 40496, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 40514, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 40536, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 40559, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 40575, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 40591, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 40608, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 40626, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 40645, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 40668, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 40690, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 40712, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 40730, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 40752, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 40774, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 40792, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 40814, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 40836, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 40857, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 40884, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 40911, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 40926, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 40942, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 40971, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 40993, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 41014, 0x00000C33 }, /* GL_STEREO */
+   { 41024, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 41048, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 41073, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 41097, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 41112, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 41131, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 41146, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 41165, 0x000088E1 }, /* GL_STREAM_READ */
+   { 41180, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 41199, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 41216, 0x000084E7 }, /* GL_SUBTRACT */
+   { 41228, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 41244, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 41262, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 41276, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 41290, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 41317, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 41347, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 41362, 0x00002001 }, /* GL_T */
+   { 41367, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 41382, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 41401, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 41417, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 41432, 0x00002A27 }, /* GL_T2F_V3F */
+   { 41443, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 41462, 0x00002A28 }, /* GL_T4F_V4F */
+   { 41473, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 41496, 0x00001702 }, /* GL_TEXTURE */
+   { 41507, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 41519, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 41535, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 41547, 0x000084CA }, /* GL_TEXTURE10 */
+   { 41560, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 41577, 0x000084CB }, /* GL_TEXTURE11 */
+   { 41590, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 41607, 0x000084CC }, /* GL_TEXTURE12 */
+   { 41620, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 41637, 0x000084CD }, /* GL_TEXTURE13 */
+   { 41650, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 41667, 0x000084CE }, /* GL_TEXTURE14 */
+   { 41680, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 41697, 0x000084CF }, /* GL_TEXTURE15 */
+   { 41710, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 41727, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 41740, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 41757, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 41770, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 41787, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 41800, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 41817, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 41830, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 41847, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 41863, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 41875, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 41888, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 41905, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 41918, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 41935, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 41948, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 41965, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 41978, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 41995, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 42008, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 42025, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 42038, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 42055, 0x000084DA }, /* GL_TEXTURE26 */
+   { 42068, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 42085, 0x000084DB }, /* GL_TEXTURE27 */
+   { 42098, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 42115, 0x000084DC }, /* GL_TEXTURE28 */
+   { 42128, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 42145, 0x000084DD }, /* GL_TEXTURE29 */
+   { 42158, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 42175, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 42191, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 42203, 0x000084DE }, /* GL_TEXTURE30 */
+   { 42216, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 42233, 0x000084DF }, /* GL_TEXTURE31 */
+   { 42246, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 42263, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 42279, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 42291, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 42307, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 42319, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 42335, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 42347, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 42363, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 42375, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 42391, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 42403, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 42419, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 42431, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 42447, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 42461, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 42481, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 42505, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 42519, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 42539, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 42563, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 42577, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 42595, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 42617, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 42643, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 42665, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 42687, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 42715, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 42747, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 42769, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 42797, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 42829, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 42851, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 42877, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 42903, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 42933, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 42961, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 42993, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 43025, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 43054, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 43087, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 43119, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 43134, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 43155, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 43180, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 43198, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 43222, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 43240, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 43262, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 43299, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 43340, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 43365, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 43394, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 43425, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 43455, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 43485, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 43520, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 43551, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 43589, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 43616, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 43648, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 43682, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 43706, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 43734, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 43758, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 43786, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 43819, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 43843, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 43865, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 43887, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 43913, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 43947, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 43980, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 44017, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 44045, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 44077, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 44100, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 44138, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 44180, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 44211, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 44239, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 44269, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 44297, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 44322, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 44342, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 44366, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 44397, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 44432, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 44467, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 44498, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 44533, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 44568, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 44599, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 44634, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 44669, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 44693, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 44724, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 44759, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 44794, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 44825, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 44860, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 44895, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 44926, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 44961, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 44996, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 45025, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 45042, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 45064, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 45090, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 45105, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 45126, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 45146, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 45172, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 45202, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 45222, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 45246, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 45263, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 45280, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 45297, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 45320, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 45337, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 45362, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 45384, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 45410, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 45428, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 45454, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 45480, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 45510, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 45537, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 45562, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 45582, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 45606, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 45633, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 45660, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 45687, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 45713, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 45743, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 45765, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 45783, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 45823, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 45853, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 45881, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 45909, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 45937, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 45958, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 45977, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 45999, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 46018, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 46038, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 46068, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 46099, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 46120, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 46145, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 46169, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 46189, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 46213, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 46233, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 46256, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 46279, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 46303, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 46331, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 46361, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 46386, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 46420, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 46437, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 46455, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 46477, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 46495, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 46513, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 46532, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 46552, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 46571, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 46600, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 46617, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 46639, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 46669, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 46698, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 46734, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 46771, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 46812, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 46845, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 46879, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 46917, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 46953, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 46987, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 47025, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 47060, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 47099, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 47140, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 47185, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 47216, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 47251, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 47292, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 47337, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 47363, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 47393, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 47425, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 47455, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 47489, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 47505, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 47536, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 47571, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 47599, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 47631, 0x00000004 }, /* GL_TRIANGLES */
+   { 47644, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 47667, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 47694, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 47710, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 47731, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 47749, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 47777, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 47809, 0x00000001 }, /* GL_TRUE */
+   { 47817, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 47836, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 47856, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 47879, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 47899, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 47920, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 47942, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 47964, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 47984, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 48005, 0x00009118 }, /* GL_UNSIGNALED */
+   { 48019, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 48036, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 48063, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 48086, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 48102, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 48134, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 48161, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 48192, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 48213, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 48238, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 48262, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 48287, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 48318, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 48353, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 48381, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 48405, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 48433, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 48460, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 48493, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 48530, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 48561, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 48588, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 48621, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 48658, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 48689, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 48721, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 48757, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 48784, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 48815, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 48846, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 48881, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 48910, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 48943, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 48964, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 48989, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 49010, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 49035, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 49056, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 49081, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 49104, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 49122, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 49152, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 49186, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 49212, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 49242, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 49276, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 49302, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 49326, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 49354, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 49382, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 49409, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 49441, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 49472, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 49486, 0x00002A20 }, /* GL_V2F */
+   { 49493, 0x00002A21 }, /* GL_V3F */
+   { 49500, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 49519, 0x00001F00 }, /* GL_VENDOR */
+   { 49529, 0x00001F02 }, /* GL_VERSION */
+   { 49540, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 49556, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 49580, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 49610, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 49641, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 49676, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 49700, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 49721, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 49744, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 49765, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 49792, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 49820, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 49848, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 49876, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 49904, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 49932, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 49960, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 49987, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 50014, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 50041, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 50068, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 50095, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 50122, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 50149, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 50176, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 50203, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 50241, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 50283, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 50318, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 50349, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 50384, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 50415, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 50450, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 50484, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 50522, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 50553, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 50588, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 50616, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 50648, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 50678, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 50712, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 50740, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 50772, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 50792, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 50814, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 50843, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 50864, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 50893, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 50926, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 50958, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 50985, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 51016, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 51046, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 51063, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 51084, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 51111, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 51123, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 51139, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 51157, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 51172, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 51192, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 51223, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 51258, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 51293, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 51313, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 51341, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 51369, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 51394, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 51419, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 51446, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 51473, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 51498, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 51523, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 51547, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 51566, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 51580, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 51598, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 51616, 0x00001506 }, /* GL_XOR */
+   { 51623, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 51642, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 51656, 0x00000000 }, /* GL_ZERO */
+   { 51664, 0x00000D16 }, /* GL_ZOOM_X */
+   { 51674, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1555] =
+static const unsigned reduced_enums[1556] =
 {
        538, /* GL_FALSE */
        831, /* GL_LINES */
        835, /* GL_LINE_LOOP */
        842, /* GL_LINE_STRIP */
-      2145, /* GL_TRIANGLES */
-      2150, /* GL_TRIANGLE_STRIP */
-      2148, /* GL_TRIANGLE_FAN */
+      2146, /* GL_TRIANGLES */
+      2151, /* GL_TRIANGLE_STRIP */
+      2149, /* GL_TRIANGLE_FAN */
       1512, /* GL_QUADS */
       1516, /* GL_QUAD_STRIP */
       1383, /* GL_POLYGON */
        832, /* GL_LINES_ADJACENCY */
        843, /* GL_LINE_STRIP_ADJACENCY */
-      2146, /* GL_TRIANGLES_ADJACENCY */
-      2151, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      2147, /* GL_TRIANGLES_ADJACENCY */
+      2152, /* GL_TRIANGLE_STRIP_ADJACENCY */
       1395, /* GL_POLYGON_STIPPLE_BIT */
       1338, /* GL_PIXEL_MODE_BIT */
        818, /* GL_LIGHTING_BIT */
@@ -4686,15 +4688,15 @@ static const unsigned reduced_enums[1555] =
       1238, /* GL_NOTEQUAL */
        694, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1809, /* GL_SRC_COLOR */
+      1810, /* GL_SRC_COLOR */
       1271, /* GL_ONE_MINUS_SRC_COLOR */
-      1807, /* GL_SRC_ALPHA */
+      1808, /* GL_SRC_ALPHA */
       1270, /* GL_ONE_MINUS_SRC_ALPHA */
        507, /* GL_DST_ALPHA */
       1268, /* GL_ONE_MINUS_DST_ALPHA */
        508, /* GL_DST_COLOR */
       1269, /* GL_ONE_MINUS_DST_COLOR */
-      1808, /* GL_SRC_ALPHA_SATURATE */
+      1809, /* GL_SRC_ALPHA_SATURATE */
        671, /* GL_FRONT_LEFT */
        672, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
@@ -4711,8 +4713,8 @@ static const unsigned reduced_enums[1555] =
        794, /* GL_INVALID_ENUM */
        799, /* GL_INVALID_VALUE */
        798, /* GL_INVALID_OPERATION */
-      1814, /* GL_STACK_OVERFLOW */
-      1815, /* GL_STACK_UNDERFLOW */
+      1815, /* GL_STACK_OVERFLOW */
+      1816, /* GL_STACK_UNDERFLOW */
       1296, /* GL_OUT_OF_MEMORY */
        795, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
@@ -4771,7 +4773,7 @@ static const unsigned reduced_enums[1555] =
        822, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        823, /* GL_LIGHT_MODEL_TWO_SIDE */
        819, /* GL_LIGHT_MODEL_AMBIENT */
-      1756, /* GL_SHADE_MODEL */
+      1757, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
@@ -4788,24 +4790,24 @@ static const unsigned reduced_enums[1555] =
        413, /* GL_DEPTH_CLEAR_VALUE */
        427, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1859, /* GL_STENCIL_TEST */
-      1840, /* GL_STENCIL_CLEAR_VALUE */
-      1842, /* GL_STENCIL_FUNC */
-      1861, /* GL_STENCIL_VALUE_MASK */
-      1841, /* GL_STENCIL_FAIL */
-      1856, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1857, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1858, /* GL_STENCIL_REF */
-      1862, /* GL_STENCIL_WRITEMASK */
+      1860, /* GL_STENCIL_TEST */
+      1841, /* GL_STENCIL_CLEAR_VALUE */
+      1843, /* GL_STENCIL_FUNC */
+      1862, /* GL_STENCIL_VALUE_MASK */
+      1842, /* GL_STENCIL_FAIL */
+      1857, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1858, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1859, /* GL_STENCIL_REF */
+      1863, /* GL_STENCIL_WRITEMASK */
       1010, /* GL_MATRIX_MODE */
       1227, /* GL_NORMALIZE */
-      2277, /* GL_VIEWPORT */
+      2278, /* GL_VIEWPORT */
       1200, /* GL_MODELVIEW_STACK_DEPTH */
       1486, /* GL_PROJECTION_STACK_DEPTH */
-      2099, /* GL_TEXTURE_STACK_DEPTH */
+      2100, /* GL_TEXTURE_STACK_DEPTH */
       1197, /* GL_MODELVIEW_MATRIX */
       1484, /* GL_PROJECTION_MATRIX */
-      2079, /* GL_TEXTURE_MATRIX */
+      2080, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
@@ -4821,8 +4823,8 @@ static const unsigned reduced_enums[1555] =
         75, /* GL_AUX_BUFFERS */
        453, /* GL_DRAW_BUFFER */
       1539, /* GL_READ_BUFFER */
-      1733, /* GL_SCISSOR_BOX */
-      1734, /* GL_SCISSOR_TEST */
+      1734, /* GL_SCISSOR_BOX */
+      1735, /* GL_SCISSOR_TEST */
        742, /* GL_INDEX_CLEAR_VALUE */
        747, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
@@ -4830,17 +4832,17 @@ static const unsigned reduced_enums[1555] =
        744, /* GL_INDEX_MODE */
       1680, /* GL_RGBA_MODE */
        452, /* GL_DOUBLEBUFFER */
-      1863, /* GL_STEREO */
+      1864, /* GL_STEREO */
       1593, /* GL_RENDER_MODE */
       1317, /* GL_PERSPECTIVE_CORRECTION_HINT */
       1375, /* GL_POINT_SMOOTH_HINT */
        838, /* GL_LINE_SMOOTH_HINT */
       1393, /* GL_POLYGON_SMOOTH_HINT */
        592, /* GL_FOG_HINT */
-      2059, /* GL_TEXTURE_GEN_S */
-      2061, /* GL_TEXTURE_GEN_T */
-      2058, /* GL_TEXTURE_GEN_R */
-      2057, /* GL_TEXTURE_GEN_Q */
+      2060, /* GL_TEXTURE_GEN_S */
+      2062, /* GL_TEXTURE_GEN_T */
+      2059, /* GL_TEXTURE_GEN_R */
+      2058, /* GL_TEXTURE_GEN_Q */
       1330, /* GL_PIXEL_MAP_I_TO_I */
       1336, /* GL_PIXEL_MAP_S_TO_S */
       1332, /* GL_PIXEL_MAP_I_TO_R */
@@ -4861,12 +4863,12 @@ static const unsigned reduced_enums[1555] =
       1323, /* GL_PIXEL_MAP_G_TO_G_SIZE */
       1321, /* GL_PIXEL_MAP_B_TO_B_SIZE */
       1319, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2162, /* GL_UNPACK_SWAP_BYTES */
-      2157, /* GL_UNPACK_LSB_FIRST */
-      2158, /* GL_UNPACK_ROW_LENGTH */
-      2161, /* GL_UNPACK_SKIP_ROWS */
-      2160, /* GL_UNPACK_SKIP_PIXELS */
-      2155, /* GL_UNPACK_ALIGNMENT */
+      2163, /* GL_UNPACK_SWAP_BYTES */
+      2158, /* GL_UNPACK_LSB_FIRST */
+      2159, /* GL_UNPACK_ROW_LENGTH */
+      2162, /* GL_UNPACK_SKIP_ROWS */
+      2161, /* GL_UNPACK_SKIP_PIXELS */
+      2156, /* GL_UNPACK_ALIGNMENT */
       1305, /* GL_PACK_SWAP_BYTES */
       1300, /* GL_PACK_LSB_FIRST */
       1301, /* GL_PACK_ROW_LENGTH */
@@ -4879,8 +4881,8 @@ static const unsigned reduced_enums[1555] =
        745, /* GL_INDEX_OFFSET */
       1555, /* GL_RED_SCALE */
       1551, /* GL_RED_BIAS */
-      2303, /* GL_ZOOM_X */
-      2304, /* GL_ZOOM_Y */
+      2304, /* GL_ZOOM_X */
+      2305, /* GL_ZOOM_Y */
        701, /* GL_GREEN_SCALE */
        697, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
@@ -4901,14 +4903,14 @@ static const unsigned reduced_enums[1555] =
       1116, /* GL_MAX_TEXTURE_STACK_DEPTH */
       1142, /* GL_MAX_VIEWPORT_DIMS */
       1019, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1873, /* GL_SUBPIXEL_BITS */
+      1874, /* GL_SUBPIXEL_BITS */
        741, /* GL_INDEX_BITS */
       1552, /* GL_RED_BITS */
        698, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
        406, /* GL_DEPTH_BITS */
-      1837, /* GL_STENCIL_BITS */
+      1838, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
@@ -4937,39 +4939,39 @@ static const unsigned reduced_enums[1555] =
        899, /* GL_MAP1_GRID_SEGMENTS */
        925, /* GL_MAP2_GRID_DOMAIN */
        926, /* GL_MAP2_GRID_SEGMENTS */
-      1956, /* GL_TEXTURE_1D */
-      1959, /* GL_TEXTURE_2D */
+      1957, /* GL_TEXTURE_1D */
+      1960, /* GL_TEXTURE_2D */
        541, /* GL_FEEDBACK_BUFFER_POINTER */
        542, /* GL_FEEDBACK_BUFFER_SIZE */
        543, /* GL_FEEDBACK_BUFFER_TYPE */
-      1743, /* GL_SELECTION_BUFFER_POINTER */
-      1744, /* GL_SELECTION_BUFFER_SIZE */
-      2105, /* GL_TEXTURE_WIDTH */
-      2065, /* GL_TEXTURE_HEIGHT */
-      2009, /* GL_TEXTURE_COMPONENTS */
-      1987, /* GL_TEXTURE_BORDER_COLOR */
-      1986, /* GL_TEXTURE_BORDER */
+      1744, /* GL_SELECTION_BUFFER_POINTER */
+      1745, /* GL_SELECTION_BUFFER_SIZE */
+      2106, /* GL_TEXTURE_WIDTH */
+      2066, /* GL_TEXTURE_HEIGHT */
+      2010, /* GL_TEXTURE_COMPONENTS */
+      1988, /* GL_TEXTURE_BORDER_COLOR */
+      1987, /* GL_TEXTURE_BORDER */
        444, /* GL_DONT_CARE */
        539, /* GL_FASTEST */
       1222, /* GL_NICEST */
         56, /* GL_AMBIENT */
        441, /* GL_DIFFUSE */
-      1796, /* GL_SPECULAR */
+      1797, /* GL_SPECULAR */
       1397, /* GL_POSITION */
-      1799, /* GL_SPOT_DIRECTION */
-      1800, /* GL_SPOT_EXPONENT */
-      1798, /* GL_SPOT_CUTOFF */
+      1800, /* GL_SPOT_DIRECTION */
+      1801, /* GL_SPOT_EXPONENT */
+      1799, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
        826, /* GL_LINEAR_ATTENUATION */
       1511, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2164, /* GL_UNSIGNED_BYTE */
-      1761, /* GL_SHORT */
-      2203, /* GL_UNSIGNED_SHORT */
+      2165, /* GL_UNSIGNED_BYTE */
+      1762, /* GL_SHORT */
+      2204, /* GL_UNSIGNED_SHORT */
        749, /* GL_INT */
-      2167, /* GL_UNSIGNED_INT */
+      2168, /* GL_UNSIGNED_INT */
        552, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4983,7 +4985,7 @@ static const unsigned reduced_enums[1555] =
        350, /* GL_COPY */
         59, /* GL_AND_INVERTED */
       1225, /* GL_NOOP */
-      2299, /* GL_XOR */
+      2300, /* GL_XOR */
       1292, /* GL_OR */
       1226, /* GL_NOR */
        529, /* GL_EQUIV */
@@ -4992,19 +4994,19 @@ static const unsigned reduced_enums[1555] =
        351, /* GL_COPY_INVERTED */
       1294, /* GL_OR_INVERTED */
       1215, /* GL_NAND */
-      1750, /* GL_SET */
+      1751, /* GL_SET */
        526, /* GL_EMISSION */
-      1760, /* GL_SHININESS */
+      1761, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
       1164, /* GL_MODELVIEW */
       1483, /* GL_PROJECTION */
-      1891, /* GL_TEXTURE */
+      1892, /* GL_TEXTURE */
        188, /* GL_COLOR */
        398, /* GL_DEPTH */
-      1822, /* GL_STENCIL */
+      1823, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1843, /* GL_STENCIL_INDEX */
+      1844, /* GL_STENCIL_INDEX */
        414, /* GL_DEPTH_COMPONENT */
       1548, /* GL_RED */
        696, /* GL_GREEN */
@@ -5020,30 +5022,30 @@ static const unsigned reduced_enums[1555] =
        544, /* GL_FILL */
       1562, /* GL_RENDER */
        540, /* GL_FEEDBACK */
-      1742, /* GL_SELECT */
+      1743, /* GL_SELECT */
        551, /* GL_FLAT */
-      1771, /* GL_SMOOTH */
+      1772, /* GL_SMOOTH */
        803, /* GL_KEEP */
       1595, /* GL_REPLACE */
        731, /* GL_INCR */
        394, /* GL_DECR */
-      2220, /* GL_VENDOR */
+      2221, /* GL_VENDOR */
       1592, /* GL_RENDERER */
-      2221, /* GL_VERSION */
+      2222, /* GL_VERSION */
        533, /* GL_EXTENSIONS */
       1692, /* GL_S */
-      1882, /* GL_T */
+      1883, /* GL_T */
       1531, /* GL_R */
       1510, /* GL_Q */
       1201, /* GL_MODULATE */
        393, /* GL_DECAL */
-      2052, /* GL_TEXTURE_ENV_MODE */
-      2051, /* GL_TEXTURE_ENV_COLOR */
-      2050, /* GL_TEXTURE_ENV */
+      2053, /* GL_TEXTURE_ENV_MODE */
+      2052, /* GL_TEXTURE_ENV_COLOR */
+      2051, /* GL_TEXTURE_ENV */
        534, /* GL_EYE_LINEAR */
       1253, /* GL_OBJECT_LINEAR */
-      1797, /* GL_SPHERE_MAP */
-      2055, /* GL_TEXTURE_GEN_MODE */
+      1798, /* GL_SPHERE_MAP */
+      2056, /* GL_TEXTURE_GEN_MODE */
       1255, /* GL_OBJECT_PLANE */
        535, /* GL_EYE_PLANE */
       1216, /* GL_NEAREST */
@@ -5052,30 +5054,30 @@ static const unsigned reduced_enums[1555] =
        830, /* GL_LINEAR_MIPMAP_NEAREST */
       1219, /* GL_NEAREST_MIPMAP_LINEAR */
        829, /* GL_LINEAR_MIPMAP_LINEAR */
-      2078, /* GL_TEXTURE_MAG_FILTER */
-      2087, /* GL_TEXTURE_MIN_FILTER */
-      2108, /* GL_TEXTURE_WRAP_S */
-      2109, /* GL_TEXTURE_WRAP_T */
+      2079, /* GL_TEXTURE_MAG_FILTER */
+      2088, /* GL_TEXTURE_MIN_FILTER */
+      2109, /* GL_TEXTURE_WRAP_S */
+      2110, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
       1594, /* GL_REPEAT */
       1391, /* GL_POLYGON_OFFSET_UNITS */
       1390, /* GL_POLYGON_OFFSET_POINT */
       1389, /* GL_POLYGON_OFFSET_LINE */
       1534, /* GL_R3_G3_B2 */
-      2217, /* GL_V2F */
-      2218, /* GL_V3F */
+      2218, /* GL_V2F */
+      2219, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
       1213, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1887, /* GL_T2F_V3F */
-      1889, /* GL_T4F_V4F */
-      1885, /* GL_T2F_C4UB_V3F */
-      1883, /* GL_T2F_C3F_V3F */
-      1886, /* GL_T2F_N3F_V3F */
-      1884, /* GL_T2F_C4F_N3F_V3F */
-      1888, /* GL_T4F_C4F_N3F_V4F */
+      1888, /* GL_T2F_V3F */
+      1890, /* GL_T4F_V4F */
+      1886, /* GL_T2F_C4UB_V3F */
+      1884, /* GL_T2F_C3F_V3F */
+      1887, /* GL_T2F_N3F_V3F */
+      1885, /* GL_T2F_C4F_N3F_V3F */
+      1889, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5106,7 +5108,7 @@ static const unsigned reduced_enums[1555] =
        676, /* GL_FUNC_REVERSE_SUBTRACT */
        330, /* GL_CONVOLUTION_1D */
        331, /* GL_CONVOLUTION_2D */
-      1745, /* GL_SEPARABLE_2D */
+      1746, /* GL_SEPARABLE_2D */
        334, /* GL_CONVOLUTION_BORDER_MODE */
        338, /* GL_CONVOLUTION_FILTER_SCALE */
        336, /* GL_CONVOLUTION_FILTER_BIAS */
@@ -5137,12 +5139,12 @@ static const unsigned reduced_enums[1555] =
       1146, /* GL_MINMAX */
       1148, /* GL_MINMAX_FORMAT */
       1150, /* GL_MINMAX_SINK */
-      1890, /* GL_TABLE_TOO_LARGE_EXT */
-      2166, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2206, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2209, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2178, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2169, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1891, /* GL_TABLE_TOO_LARGE_EXT */
+      2167, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2207, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2210, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2179, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2170, /* GL_UNSIGNED_INT_10_10_10_2 */
       1388, /* GL_POLYGON_OFFSET_FILL */
       1387, /* GL_POLYGON_OFFSET_FACTOR */
       1386, /* GL_POLYGON_OFFSET_BIAS */
@@ -5180,39 +5182,39 @@ static const unsigned reduced_enums[1555] =
       1606, /* GL_RGB10_A2 */
       1645, /* GL_RGBA12 */
       1647, /* GL_RGBA16 */
-      2095, /* GL_TEXTURE_RED_SIZE */
-      2063, /* GL_TEXTURE_GREEN_SIZE */
-      1984, /* GL_TEXTURE_BLUE_SIZE */
-      1964, /* GL_TEXTURE_ALPHA_SIZE */
-      2076, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2067, /* GL_TEXTURE_INTENSITY_SIZE */
+      2096, /* GL_TEXTURE_RED_SIZE */
+      2064, /* GL_TEXTURE_GREEN_SIZE */
+      1985, /* GL_TEXTURE_BLUE_SIZE */
+      1965, /* GL_TEXTURE_ALPHA_SIZE */
+      2077, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2068, /* GL_TEXTURE_INTENSITY_SIZE */
       1596, /* GL_REPLACE_EXT */
       1494, /* GL_PROXY_TEXTURE_1D */
       1498, /* GL_PROXY_TEXTURE_2D */
-      2103, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2089, /* GL_TEXTURE_PRIORITY */
-      2097, /* GL_TEXTURE_RESIDENT */
-      1967, /* GL_TEXTURE_BINDING_1D */
-      1970, /* GL_TEXTURE_BINDING_2D */
-      1973, /* GL_TEXTURE_BINDING_3D */
+      2104, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2090, /* GL_TEXTURE_PRIORITY */
+      2098, /* GL_TEXTURE_RESIDENT */
+      1968, /* GL_TEXTURE_BINDING_1D */
+      1971, /* GL_TEXTURE_BINDING_2D */
+      1974, /* GL_TEXTURE_BINDING_3D */
       1302, /* GL_PACK_SKIP_IMAGES */
       1298, /* GL_PACK_IMAGE_HEIGHT */
-      2159, /* GL_UNPACK_SKIP_IMAGES */
-      2156, /* GL_UNPACK_IMAGE_HEIGHT */
-      1962, /* GL_TEXTURE_3D */
+      2160, /* GL_UNPACK_SKIP_IMAGES */
+      2157, /* GL_UNPACK_IMAGE_HEIGHT */
+      1963, /* GL_TEXTURE_3D */
       1502, /* GL_PROXY_TEXTURE_3D */
-      2047, /* GL_TEXTURE_DEPTH */
-      2106, /* GL_TEXTURE_WRAP_R */
+      2048, /* GL_TEXTURE_DEPTH */
+      2107, /* GL_TEXTURE_WRAP_R */
       1014, /* GL_MAX_3D_TEXTURE_SIZE */
-      2222, /* GL_VERTEX_ARRAY */
+      2223, /* GL_VERTEX_ARRAY */
       1228, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
        735, /* GL_INDEX_ARRAY */
-      2017, /* GL_TEXTURE_COORD_ARRAY */
+      2018, /* GL_TEXTURE_COORD_ARRAY */
        518, /* GL_EDGE_FLAG_ARRAY */
-      2228, /* GL_VERTEX_ARRAY_SIZE */
-      2230, /* GL_VERTEX_ARRAY_TYPE */
-      2229, /* GL_VERTEX_ARRAY_STRIDE */
+      2229, /* GL_VERTEX_ARRAY_SIZE */
+      2231, /* GL_VERTEX_ARRAY_TYPE */
+      2230, /* GL_VERTEX_ARRAY_STRIDE */
       1233, /* GL_NORMAL_ARRAY_TYPE */
       1232, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
@@ -5220,24 +5222,24 @@ static const unsigned reduced_enums[1555] =
        194, /* GL_COLOR_ARRAY_STRIDE */
        740, /* GL_INDEX_ARRAY_TYPE */
        739, /* GL_INDEX_ARRAY_STRIDE */
-      2021, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2023, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2022, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      2022, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2024, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2023, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        522, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2227, /* GL_VERTEX_ARRAY_POINTER */
+      2228, /* GL_VERTEX_ARRAY_POINTER */
       1231, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
        738, /* GL_INDEX_ARRAY_POINTER */
-      2020, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      2021, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        521, /* GL_EDGE_FLAG_ARRAY_POINTER */
       1206, /* GL_MULTISAMPLE */
-      1719, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1721, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1726, /* GL_SAMPLE_COVERAGE */
-      1723, /* GL_SAMPLE_BUFFERS */
-      1714, /* GL_SAMPLES */
-      1730, /* GL_SAMPLE_COVERAGE_VALUE */
-      1728, /* GL_SAMPLE_COVERAGE_INVERT */
+      1720, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1722, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1727, /* GL_SAMPLE_COVERAGE */
+      1724, /* GL_SAMPLE_BUFFERS */
+      1715, /* GL_SAMPLES */
+      1731, /* GL_SAMPLE_COVERAGE_VALUE */
+      1729, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
       1026, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
@@ -5249,9 +5251,9 @@ static const unsigned reduced_enums[1555] =
       1407, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
       1402, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
       1398, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2000, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      2001, /* GL_TEXTURE_COLOR_TABLE_SGI */
       1503, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2002, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      2003, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         94, /* GL_BLEND_DST_RGB */
        108, /* GL_BLEND_SRC_RGB */
         92, /* GL_BLEND_DST_ALPHA */
@@ -5276,7 +5278,7 @@ static const unsigned reduced_enums[1555] =
         80, /* GL_BGRA */
       1041, /* GL_MAX_ELEMENTS_VERTICES */
       1040, /* GL_MAX_ELEMENTS_INDICES */
-      2066, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      2067, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
       1369, /* GL_POINT_SIZE_MIN */
       1365, /* GL_POINT_SIZE_MAX */
@@ -5284,10 +5286,10 @@ static const unsigned reduced_enums[1555] =
       1350, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2088, /* GL_TEXTURE_MIN_LOD */
-      2086, /* GL_TEXTURE_MAX_LOD */
-      1966, /* GL_TEXTURE_BASE_LEVEL */
-      2085, /* GL_TEXTURE_MAX_LEVEL */
+      2089, /* GL_TEXTURE_MIN_LOD */
+      2087, /* GL_TEXTURE_MAX_LOD */
+      1967, /* GL_TEXTURE_BASE_LEVEL */
+      2086, /* GL_TEXTURE_MAX_LEVEL */
        726, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
       1597, /* GL_REPLICATE_BORDER_HP */
@@ -5295,41 +5297,41 @@ static const unsigned reduced_enums[1555] =
       1261, /* GL_OCCLUSION_TEST_HP */
       1262, /* GL_OCCLUSION_TEST_RESULT_HP */
        827, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1994, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1996, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1998, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1999, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1997, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1995, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1995, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1997, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1999, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2000, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1998, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1996, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
       1020, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
       1021, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
       1433, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
       1435, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
       1432, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
       1434, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2074, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2075, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2073, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      2075, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2076, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2074, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        682, /* GL_GENERATE_MIPMAP */
        683, /* GL_GENERATE_MIPMAP_HINT */
        595, /* GL_FOG_OFFSET_SGIX */
        596, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2008, /* GL_TEXTURE_COMPARE_SGIX */
-      2007, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2070, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2062, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      2009, /* GL_TEXTURE_COMPARE_SGIX */
+      2008, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2071, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2063, /* GL_TEXTURE_GEQUAL_R_SGIX */
        415, /* GL_DEPTH_COMPONENT16 */
        419, /* GL_DEPTH_COMPONENT24 */
        423, /* GL_DEPTH_COMPONENT32 */
        357, /* GL_CULL_VERTEX_EXT */
        359, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        358, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2295, /* GL_WRAP_BORDER_SUN */
-      2001, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      2296, /* GL_WRAP_BORDER_SUN */
+      2002, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        820, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1764, /* GL_SINGLE_COLOR */
-      1748, /* GL_SEPARATE_SPECULAR_COLOR */
-      1759, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1765, /* GL_SINGLE_COLOR */
+      1749, /* GL_SEPARATE_SPECULAR_COLOR */
+      1760, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        607, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        608, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        619, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -5347,19 +5349,19 @@ static const unsigned reduced_enums[1555] =
        327, /* GL_CONTEXT_FLAGS */
        734, /* GL_INDEX */
        409, /* GL_DEPTH_BUFFER */
-      1838, /* GL_STENCIL_BUFFER */
+      1839, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
-      2165, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2210, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2211, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2207, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2204, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2179, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2175, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2083, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2084, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2082, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      2166, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2211, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2212, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2208, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2205, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2180, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2176, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2084, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2085, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2083, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
       1156, /* GL_MIRRORED_REPEAT */
       1685, /* GL_RGB_S3TC */
       1627, /* GL_RGB4_S3TC */
@@ -5384,54 +5386,54 @@ static const unsigned reduced_enums[1555] =
        576, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        384, /* GL_CURRENT_SECONDARY_COLOR */
-      1739, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1741, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1740, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1738, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1735, /* GL_SECONDARY_COLOR_ARRAY */
+      1740, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1742, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1741, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1739, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1736, /* GL_SECONDARY_COLOR_ARRAY */
        382, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1892, /* GL_TEXTURE0 */
-      1894, /* GL_TEXTURE1 */
-      1916, /* GL_TEXTURE2 */
-      1938, /* GL_TEXTURE3 */
-      1944, /* GL_TEXTURE4 */
-      1946, /* GL_TEXTURE5 */
-      1948, /* GL_TEXTURE6 */
-      1950, /* GL_TEXTURE7 */
-      1952, /* GL_TEXTURE8 */
-      1954, /* GL_TEXTURE9 */
-      1895, /* GL_TEXTURE10 */
-      1897, /* GL_TEXTURE11 */
-      1899, /* GL_TEXTURE12 */
-      1901, /* GL_TEXTURE13 */
-      1903, /* GL_TEXTURE14 */
-      1905, /* GL_TEXTURE15 */
-      1907, /* GL_TEXTURE16 */
-      1909, /* GL_TEXTURE17 */
-      1911, /* GL_TEXTURE18 */
-      1913, /* GL_TEXTURE19 */
-      1917, /* GL_TEXTURE20 */
-      1919, /* GL_TEXTURE21 */
-      1921, /* GL_TEXTURE22 */
-      1923, /* GL_TEXTURE23 */
-      1925, /* GL_TEXTURE24 */
-      1927, /* GL_TEXTURE25 */
-      1929, /* GL_TEXTURE26 */
-      1931, /* GL_TEXTURE27 */
-      1933, /* GL_TEXTURE28 */
-      1935, /* GL_TEXTURE29 */
-      1939, /* GL_TEXTURE30 */
-      1941, /* GL_TEXTURE31 */
+      1893, /* GL_TEXTURE0 */
+      1895, /* GL_TEXTURE1 */
+      1917, /* GL_TEXTURE2 */
+      1939, /* GL_TEXTURE3 */
+      1945, /* GL_TEXTURE4 */
+      1947, /* GL_TEXTURE5 */
+      1949, /* GL_TEXTURE6 */
+      1951, /* GL_TEXTURE7 */
+      1953, /* GL_TEXTURE8 */
+      1955, /* GL_TEXTURE9 */
+      1896, /* GL_TEXTURE10 */
+      1898, /* GL_TEXTURE11 */
+      1900, /* GL_TEXTURE12 */
+      1902, /* GL_TEXTURE13 */
+      1904, /* GL_TEXTURE14 */
+      1906, /* GL_TEXTURE15 */
+      1908, /* GL_TEXTURE16 */
+      1910, /* GL_TEXTURE17 */
+      1912, /* GL_TEXTURE18 */
+      1914, /* GL_TEXTURE19 */
+      1918, /* GL_TEXTURE20 */
+      1920, /* GL_TEXTURE21 */
+      1922, /* GL_TEXTURE22 */
+      1924, /* GL_TEXTURE23 */
+      1926, /* GL_TEXTURE24 */
+      1928, /* GL_TEXTURE25 */
+      1930, /* GL_TEXTURE26 */
+      1932, /* GL_TEXTURE27 */
+      1934, /* GL_TEXTURE28 */
+      1936, /* GL_TEXTURE29 */
+      1940, /* GL_TEXTURE30 */
+      1942, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
       1117, /* GL_MAX_TEXTURE_UNITS */
-      2138, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2141, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2143, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2135, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1874, /* GL_SUBTRACT */
+      2139, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2142, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2144, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2136, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1875, /* GL_SUBTRACT */
       1098, /* GL_MAX_RENDERBUFFER_SIZE */
        290, /* GL_COMPRESSED_ALPHA */
        294, /* GL_COMPRESSED_LUMINANCE */
@@ -5439,18 +5441,18 @@ static const unsigned reduced_enums[1555] =
        292, /* GL_COMPRESSED_INTENSITY */
        300, /* GL_COMPRESSED_RGB */
        301, /* GL_COMPRESSED_RGBA */
-      2015, /* GL_TEXTURE_COMPRESSION_HINT */
-      2092, /* GL_TEXTURE_RECTANGLE */
-      1980, /* GL_TEXTURE_BINDING_RECTANGLE */
+      2016, /* GL_TEXTURE_COMPRESSION_HINT */
+      2093, /* GL_TEXTURE_RECTANGLE */
+      1981, /* GL_TEXTURE_BINDING_RECTANGLE */
       1506, /* GL_PROXY_TEXTURE_RECTANGLE */
       1095, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
        430, /* GL_DEPTH_STENCIL */
-      2171, /* GL_UNSIGNED_INT_24_8 */
+      2172, /* GL_UNSIGNED_INT_24_8 */
       1112, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2081, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      2082, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
       1114, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2053, /* GL_TEXTURE_FILTER_CONTROL */
-      2071, /* GL_TEXTURE_LOD_BIAS */
+      2054, /* GL_TEXTURE_FILTER_CONTROL */
+      2072, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
       1104, /* GL_MAX_SHININESS_NV */
       1105, /* GL_MAX_SPOT_EXPONENT_NV */
@@ -5459,14 +5461,14 @@ static const unsigned reduced_enums[1555] =
       1176, /* GL_MODELVIEW1_ARB */
       1234, /* GL_NORMAL_MAP */
       1557, /* GL_REFLECTION_MAP */
-      2025, /* GL_TEXTURE_CUBE_MAP */
-      1977, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2037, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2027, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2040, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2030, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2043, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2033, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      2026, /* GL_TEXTURE_CUBE_MAP */
+      1978, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2038, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2028, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2041, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2031, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2044, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2034, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
       1504, /* GL_PROXY_TEXTURE_CUBE_MAP */
       1034, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
       1212, /* GL_MULTISAMPLE_FILTER_HINT_NV */
@@ -5484,14 +5486,14 @@ static const unsigned reduced_enums[1555] =
        316, /* GL_CONSTANT */
       1439, /* GL_PRIMARY_COLOR */
       1436, /* GL_PREVIOUS */
-      1779, /* GL_SOURCE0_RGB */
-      1785, /* GL_SOURCE1_RGB */
-      1791, /* GL_SOURCE2_RGB */
-      1795, /* GL_SOURCE3_RGB_NV */
-      1776, /* GL_SOURCE0_ALPHA */
-      1782, /* GL_SOURCE1_ALPHA */
-      1788, /* GL_SOURCE2_ALPHA */
-      1794, /* GL_SOURCE3_ALPHA_NV */
+      1780, /* GL_SOURCE0_RGB */
+      1786, /* GL_SOURCE1_RGB */
+      1792, /* GL_SOURCE2_RGB */
+      1796, /* GL_SOURCE3_RGB_NV */
+      1777, /* GL_SOURCE0_ALPHA */
+      1783, /* GL_SOURCE1_ALPHA */
+      1789, /* GL_SOURCE2_ALPHA */
+      1795, /* GL_SOURCE3_ALPHA_NV */
       1275, /* GL_OPERAND0_RGB */
       1281, /* GL_OPERAND1_RGB */
       1287, /* GL_OPERAND2_RGB */
@@ -5501,32 +5503,32 @@ static const unsigned reduced_enums[1555] =
       1284, /* GL_OPERAND2_ALPHA */
       1290, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2223, /* GL_VERTEX_ARRAY_BINDING */
-      2090, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2091, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2300, /* GL_YCBCR_422_APPLE */
-      2212, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2214, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2102, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1865, /* GL_STORAGE_PRIVATE_APPLE */
-      1864, /* GL_STORAGE_CACHED_APPLE */
-      1866, /* GL_STORAGE_SHARED_APPLE */
-      1766, /* GL_SLICE_ACCUM_SUN */
+      2224, /* GL_VERTEX_ARRAY_BINDING */
+      2091, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2092, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2301, /* GL_YCBCR_422_APPLE */
+      2213, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2215, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2103, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1866, /* GL_STORAGE_PRIVATE_APPLE */
+      1865, /* GL_STORAGE_CACHED_APPLE */
+      1867, /* GL_STORAGE_SHARED_APPLE */
+      1767, /* GL_SLICE_ACCUM_SUN */
       1515, /* GL_QUAD_MESH_SUN */
-      2149, /* GL_TRIANGLE_MESH_SUN */
-      2265, /* GL_VERTEX_PROGRAM_ARB */
-      2276, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2250, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2258, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2260, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2262, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2150, /* GL_TRIANGLE_MESH_SUN */
+      2266, /* GL_VERTEX_PROGRAM_ARB */
+      2277, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2251, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2259, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2261, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2263, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        386, /* GL_CURRENT_VERTEX_ATTRIB */
       1460, /* GL_PROGRAM_LENGTH_ARB */
       1476, /* GL_PROGRAM_STRING_ARB */
       1199, /* GL_MODELVIEW_PROJECTION_NV */
        725, /* GL_IDENTITY_NV */
        800, /* GL_INVERSE_NV */
-      2140, /* GL_TRANSPOSE_NV */
+      2141, /* GL_TRANSPOSE_NV */
        801, /* GL_INVERSE_TRANSPOSE_NV */
       1079, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
       1078, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -5541,32 +5543,32 @@ static const unsigned reduced_enums[1555] =
        369, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        366, /* GL_CURRENT_MATRIX_ARB */
       1473, /* GL_PROGRAM_POINT_SIZE */
-      2271, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      2272, /* GL_VERTEX_PROGRAM_TWO_SIDE */
       1472, /* GL_PROGRAM_PARAMETER_NV */
-      2256, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      2257, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
       1478, /* GL_PROGRAM_TARGET_NV */
       1475, /* GL_PROGRAM_RESIDENT_NV */
-      2112, /* GL_TRACK_MATRIX_NV */
-      2113, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2266, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      2113, /* GL_TRACK_MATRIX_NV */
+      2114, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2267, /* GL_VERTEX_PROGRAM_BINDING_NV */
       1454, /* GL_PROGRAM_ERROR_POSITION_ARB */
        411, /* GL_DEPTH_CLAMP */
-      2231, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2238, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2239, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2240, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2241, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2242, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2243, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2244, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2245, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2246, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2232, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2233, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2234, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2235, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2236, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2237, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      2232, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2239, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2240, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2241, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2242, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2243, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2244, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2245, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2246, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2247, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2233, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2234, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2235, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2236, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2237, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2238, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        908, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        915, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        916, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -5599,27 +5601,27 @@ static const unsigned reduced_enums[1555] =
        939, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        940, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        941, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2013, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2010, /* GL_TEXTURE_COMPRESSED */
+      2014, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2011, /* GL_TEXTURE_COMPRESSED */
       1240, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
       1139, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2294, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2264, /* GL_VERTEX_BLEND_ARB */
+      2295, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2265, /* GL_VERTEX_BLEND_ARB */
        388, /* GL_CURRENT_WEIGHT_ARB */
-      2292, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2290, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2288, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2286, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2281, /* GL_WEIGHT_ARRAY_ARB */
+      2293, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2291, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2289, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2287, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2282, /* GL_WEIGHT_ARRAY_ARB */
        445, /* GL_DOT3_RGB */
        446, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
       1207, /* GL_MULTISAMPLE_3DFX */
-      1724, /* GL_SAMPLE_BUFFERS_3DFX */
-      1715, /* GL_SAMPLES_3DFX */
+      1725, /* GL_SAMPLE_BUFFERS_3DFX */
+      1716, /* GL_SAMPLES_3DFX */
       1187, /* GL_MODELVIEW2_ARB */
       1190, /* GL_MODELVIEW3_ARB */
       1191, /* GL_MODELVIEW4_ARB */
@@ -5657,7 +5659,7 @@ static const unsigned reduced_enums[1555] =
       1202, /* GL_MODULATE_ADD_ATI */
       1203, /* GL_MODULATE_SIGNED_ADD_ATI */
       1204, /* GL_MODULATE_SUBTRACT_ATI */
-      2301, /* GL_YCBCR_MESA */
+      2302, /* GL_YCBCR_MESA */
       1299, /* GL_PACK_INVERT_MESA */
        391, /* GL_DEBUG_OBJECT_MESA */
        392, /* GL_DEBUG_PRINT_MESA */
@@ -5674,10 +5676,10 @@ static const unsigned reduced_enums[1555] =
        147, /* GL_BUMP_TARGET_ATI */
       1243, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
       1451, /* GL_PROGRAM_BINARY_FORMATS_OES */
-      1828, /* GL_STENCIL_BACK_FUNC */
-      1826, /* GL_STENCIL_BACK_FAIL */
-      1830, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1832, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1829, /* GL_STENCIL_BACK_FUNC */
+      1827, /* GL_STENCIL_BACK_FAIL */
+      1831, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1833, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        599, /* GL_FRAGMENT_PROGRAM_ARB */
       1449, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
       1481, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
@@ -5724,10 +5726,10 @@ static const unsigned reduced_enums[1555] =
       1008, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
       1006, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
       1002, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2048, /* GL_TEXTURE_DEPTH_SIZE */
+      2049, /* GL_TEXTURE_DEPTH_SIZE */
        438, /* GL_DEPTH_TEXTURE_MODE */
-      2005, /* GL_TEXTURE_COMPARE_MODE */
-      2003, /* GL_TEXTURE_COMPARE_FUNC */
+      2006, /* GL_TEXTURE_COMPARE_MODE */
+      2004, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
       1376, /* GL_POINT_SPRITE */
        346, /* GL_COORD_REPLACE */
@@ -5737,7 +5739,7 @@ static const unsigned reduced_enums[1555] =
       1525, /* GL_QUERY_RESULT */
       1527, /* GL_QUERY_RESULT_AVAILABLE */
       1131, /* GL_MAX_VERTEX_ATTRIBS */
-      2254, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      2255, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        436, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        435, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
       1108, /* GL_MAX_TEXTURE_COORDS */
@@ -5745,23 +5747,23 @@ static const unsigned reduced_enums[1555] =
       1456, /* GL_PROGRAM_ERROR_STRING_ARB */
       1458, /* GL_PROGRAM_FORMAT_ASCII_ARB */
       1457, /* GL_PROGRAM_FORMAT_ARB */
-      2104, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      2105, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        408, /* GL_DEPTH_BOUNDS_TEST_EXT */
        407, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
        523, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
        524, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2225, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      2226, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
       1229, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        736, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2018, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      2019, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        519, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1736, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1737, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        577, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2282, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2247, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      2283, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2248, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
       1459, /* GL_PROGRAM_INSTRUCTIONS_ARB */
       1074, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
       1465, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@@ -5785,14 +5787,14 @@ static const unsigned reduced_enums[1555] =
       1075, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
       1071, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
       1482, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2137, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      2138, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
       1544, /* GL_READ_ONLY */
-      2296, /* GL_WRITE_ONLY */
+      2297, /* GL_WRITE_ONLY */
       1546, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2111, /* GL_TIME_ELAPSED_EXT */
+      2112, /* GL_TIME_ELAPSED_EXT */
        959, /* GL_MATRIX0_ARB */
        971, /* GL_MATRIX1_ARB */
        983, /* GL_MATRIX2_ARB */
@@ -5825,12 +5827,12 @@ static const unsigned reduced_enums[1555] =
        982, /* GL_MATRIX29_ARB */
        985, /* GL_MATRIX30_ARB */
        986, /* GL_MATRIX31_ARB */
-      1869, /* GL_STREAM_DRAW */
-      1871, /* GL_STREAM_READ */
-      1867, /* GL_STREAM_COPY */
-      1818, /* GL_STATIC_DRAW */
-      1820, /* GL_STATIC_READ */
-      1816, /* GL_STATIC_COPY */
+      1870, /* GL_STREAM_DRAW */
+      1872, /* GL_STREAM_READ */
+      1868, /* GL_STREAM_COPY */
+      1819, /* GL_STATIC_DRAW */
+      1821, /* GL_STATIC_READ */
+      1817, /* GL_STATIC_COPY */
        513, /* GL_DYNAMIC_DRAW */
        515, /* GL_DYNAMIC_READ */
        511, /* GL_DYNAMIC_COPY */
@@ -5839,24 +5841,25 @@ static const unsigned reduced_enums[1555] =
       1340, /* GL_PIXEL_PACK_BUFFER_BINDING */
       1344, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        399, /* GL_DEPTH24_STENCIL8 */
-      2100, /* GL_TEXTURE_STENCIL_SIZE */
-      2046, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      2101, /* GL_TEXTURE_STENCIL_SIZE */
+      2047, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
       1070, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
       1073, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
       1077, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
       1076, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2252, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2249, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      2253, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2250, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
       1016, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
       1154, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
       1090, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1860, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1861, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
       1161, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1717, /* GL_SAMPLES_PASSED */
+      1718, /* GL_SAMPLES_PASSED */
        692, /* GL_GEOMETRY_VERTICES_OUT */
        686, /* GL_GEOMETRY_INPUT_TYPE */
        688, /* GL_GEOMETRY_OUTPUT_TYPE */
+      1709, /* GL_SAMPLER_BINDING */
        164, /* GL_CLAMP_VERTEX_COLOR_ARB */
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
@@ -5866,25 +5869,25 @@ static const unsigned reduced_enums[1555] =
       1361, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
       1198, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
       1485, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2080, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2081, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
       1561, /* GL_RELEASED_APPLE */
-      2279, /* GL_VOLATILE_APPLE */
+      2280, /* GL_VOLATILE_APPLE */
       1600, /* GL_RETAINED_APPLE */
-      2154, /* GL_UNDEFINED_APPLE */
+      2155, /* GL_UNDEFINED_APPLE */
       1509, /* GL_PURGEABLE_APPLE */
        600, /* GL_FRAGMENT_SHADER */
-      2274, /* GL_VERTEX_SHADER */
+      2275, /* GL_VERTEX_SHADER */
       1470, /* GL_PROGRAM_OBJECT_ARB */
-      1753, /* GL_SHADER_OBJECT_ARB */
+      1754, /* GL_SHADER_OBJECT_ARB */
       1045, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
       1136, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
       1127, /* GL_MAX_VARYING_COMPONENTS */
       1134, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
       1028, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
       1259, /* GL_OBJECT_TYPE_ARB */
-      1755, /* GL_SHADER_TYPE */
+      1756, /* GL_SHADER_TYPE */
        565, /* GL_FLOAT_VEC2 */
        567, /* GL_FLOAT_VEC3 */
        569, /* GL_FLOAT_VEC4 */
@@ -5901,7 +5904,7 @@ static const unsigned reduced_enums[1555] =
       1693, /* GL_SAMPLER_1D */
       1699, /* GL_SAMPLER_2D */
       1707, /* GL_SAMPLER_3D */
-      1711, /* GL_SAMPLER_CUBE */
+      1712, /* GL_SAMPLER_CUBE */
       1698, /* GL_SAMPLER_1D_SHADOW */
       1706, /* GL_SAMPLER_2D_SHADOW */
       1704, /* GL_SAMPLER_2D_RECT */
@@ -5915,16 +5918,16 @@ static const unsigned reduced_enums[1555] =
        397, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
        849, /* GL_LINK_STATUS */
-      2219, /* GL_VALIDATE_STATUS */
+      2220, /* GL_VALIDATE_STATUS */
        748, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1754, /* GL_SHADER_SOURCE_LENGTH */
+      1755, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        602, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1757, /* GL_SHADING_LANGUAGE_VERSION */
+      1758, /* GL_SHADING_LANGUAGE_VERSION */
        374, /* GL_CURRENT_PROGRAM */
       1308, /* GL_PALETTE4_RGB8_OES */
       1310, /* GL_PALETTE4_RGBA8_OES */
@@ -5939,60 +5942,60 @@ static const unsigned reduced_enums[1555] =
        729, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
        727, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
       1360, /* GL_POINT_SIZE_ARRAY_OES */
-      2024, /* GL_TEXTURE_CROP_RECT_OES */
+      2025, /* GL_TEXTURE_CROP_RECT_OES */
       1000, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
       1359, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2202, /* GL_UNSIGNED_NORMALIZED */
-      1957, /* GL_TEXTURE_1D_ARRAY */
+      2203, /* GL_UNSIGNED_NORMALIZED */
+      1958, /* GL_TEXTURE_1D_ARRAY */
       1495, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1960, /* GL_TEXTURE_2D_ARRAY */
+      1961, /* GL_TEXTURE_2D_ARRAY */
       1499, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      1968, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      1971, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1969, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      1972, /* GL_TEXTURE_BINDING_2D_ARRAY */
       1052, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      1988, /* GL_TEXTURE_BUFFER */
+      1989, /* GL_TEXTURE_BUFFER */
       1106, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      1975, /* GL_TEXTURE_BINDING_BUFFER */
-      1990, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      1992, /* GL_TEXTURE_BUFFER_FORMAT */
+      1976, /* GL_TEXTURE_BINDING_BUFFER */
+      1991, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      1993, /* GL_TEXTURE_BUFFER_FORMAT */
       1532, /* GL_R11F_G11F_B10F */
-      2168, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      2169, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
       1643, /* GL_RGB9_E5 */
-      2177, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2098, /* GL_TEXTURE_SHARED_SIZE */
-      1810, /* GL_SRGB */
-      1811, /* GL_SRGB8 */
-      1813, /* GL_SRGB_ALPHA */
-      1812, /* GL_SRGB8_ALPHA8 */
-      1770, /* GL_SLUMINANCE_ALPHA */
-      1769, /* GL_SLUMINANCE8_ALPHA8 */
-      1767, /* GL_SLUMINANCE */
-      1768, /* GL_SLUMINANCE8 */
+      2178, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2099, /* GL_TEXTURE_SHARED_SIZE */
+      1811, /* GL_SRGB */
+      1812, /* GL_SRGB8 */
+      1814, /* GL_SRGB_ALPHA */
+      1813, /* GL_SRGB8_ALPHA8 */
+      1771, /* GL_SLUMINANCE_ALPHA */
+      1770, /* GL_SLUMINANCE8_ALPHA8 */
+      1768, /* GL_SLUMINANCE */
+      1769, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2133, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2122, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      2134, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2123, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
       1125, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2131, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2127, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2125, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      2132, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2128, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2126, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
       1442, /* GL_PRIMITIVES_GENERATED */
-      2129, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      2130, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
       1536, /* GL_RASTERIZER_DISCARD */
       1121, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
       1123, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
        766, /* GL_INTERLEAVED_ATTRIBS */
-      1746, /* GL_SEPARATE_ATTRIBS */
-      2117, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2119, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1747, /* GL_SEPARATE_ATTRIBS */
+      2118, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2120, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
       1378, /* GL_POINT_SPRITE_COORD_ORIGIN */
        857, /* GL_LOWER_LEFT */
-      2216, /* GL_UPPER_LEFT */
-      1834, /* GL_STENCIL_BACK_REF */
-      1835, /* GL_STENCIL_BACK_VALUE_MASK */
-      1836, /* GL_STENCIL_BACK_WRITEMASK */
+      2217, /* GL_UPPER_LEFT */
+      1835, /* GL_STENCIL_BACK_REF */
+      1836, /* GL_STENCIL_BACK_VALUE_MASK */
+      1837, /* GL_STENCIL_BACK_WRITEMASK */
        503, /* GL_DRAW_FRAMEBUFFER_BINDING */
       1566, /* GL_RENDERBUFFER_BINDING */
       1540, /* GL_READ_FRAMEBUFFER */
@@ -6032,17 +6035,17 @@ static const unsigned reduced_enums[1555] =
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
        402, /* GL_DEPTH_ATTACHMENT */
-      1823, /* GL_STENCIL_ATTACHMENT */
+      1824, /* GL_STENCIL_ATTACHMENT */
        604, /* GL_FRAMEBUFFER */
       1563, /* GL_RENDERBUFFER */
       1589, /* GL_RENDERBUFFER_WIDTH */
       1576, /* GL_RENDERBUFFER_HEIGHT */
       1579, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1855, /* GL_STENCIL_INDEX_EXT */
-      1844, /* GL_STENCIL_INDEX1 */
-      1849, /* GL_STENCIL_INDEX4 */
-      1852, /* GL_STENCIL_INDEX8 */
-      1845, /* GL_STENCIL_INDEX16 */
+      1856, /* GL_STENCIL_INDEX_EXT */
+      1845, /* GL_STENCIL_INDEX1 */
+      1850, /* GL_STENCIL_INDEX4 */
+      1853, /* GL_STENCIL_INDEX8 */
+      1846, /* GL_STENCIL_INDEX16 */
       1583, /* GL_RENDERBUFFER_RED_SIZE */
       1574, /* GL_RENDERBUFFER_GREEN_SIZE */
       1569, /* GL_RENDERBUFFER_BLUE_SIZE */
@@ -6051,7 +6054,7 @@ static const unsigned reduced_enums[1555] =
       1587, /* GL_RENDERBUFFER_STENCIL_SIZE */
        657, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
       1101, /* GL_MAX_SAMPLES */
-      2060, /* GL_TEXTURE_GEN_STR_OES */
+      2061, /* GL_TEXTURE_GEN_STR_OES */
        703, /* GL_HALF_FLOAT_OES */
       1630, /* GL_RGB565_OES */
       1660, /* GL_RGBA32UI */
@@ -6106,13 +6109,13 @@ static const unsigned reduced_enums[1555] =
        651, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
       1694, /* GL_SAMPLER_1D_ARRAY */
       1700, /* GL_SAMPLER_2D_ARRAY */
-      1709, /* GL_SAMPLER_BUFFER */
+      1710, /* GL_SAMPLER_BUFFER */
       1696, /* GL_SAMPLER_1D_ARRAY_SHADOW */
       1702, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1712, /* GL_SAMPLER_CUBE_SHADOW */
-      2196, /* GL_UNSIGNED_INT_VEC2 */
-      2198, /* GL_UNSIGNED_INT_VEC3 */
-      2200, /* GL_UNSIGNED_INT_VEC4 */
+      1713, /* GL_SAMPLER_CUBE_SHADOW */
+      2197, /* GL_UNSIGNED_INT_VEC2 */
+      2199, /* GL_UNSIGNED_INT_VEC3 */
+      2201, /* GL_UNSIGNED_INT_VEC4 */
        772, /* GL_INT_SAMPLER_1D */
        776, /* GL_INT_SAMPLER_2D */
        782, /* GL_INT_SAMPLER_3D */
@@ -6121,14 +6124,14 @@ static const unsigned reduced_enums[1555] =
        773, /* GL_INT_SAMPLER_1D_ARRAY */
        777, /* GL_INT_SAMPLER_2D_ARRAY */
        784, /* GL_INT_SAMPLER_BUFFER */
-      2180, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2184, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2190, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2194, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2188, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2181, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2185, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2192, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+      2181, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2185, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2191, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2195, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2189, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2182, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2186, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2193, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
        690, /* GL_GEOMETRY_SHADER */
        693, /* GL_GEOMETRY_VERTICES_OUT_ARB */
        687, /* GL_GEOMETRY_INPUT_TYPE_ARB */
@@ -6144,11 +6147,11 @@ static const unsigned reduced_enums[1555] =
        859, /* GL_LOW_INT */
       1144, /* GL_MEDIUM_INT */
        705, /* GL_HIGH_INT */
-      2170, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+      2171, /* GL_UNSIGNED_INT_10_10_10_2_OES */
        771, /* GL_INT_10_10_10_2_OES */
-      1751, /* GL_SHADER_BINARY_FORMATS */
+      1752, /* GL_SHADER_BINARY_FORMATS */
       1244, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1752, /* GL_SHADER_COMPILER */
+      1753, /* GL_SHADER_COMPILER */
       1138, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
       1130, /* GL_MAX_VARYING_VECTORS */
       1047, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
@@ -6156,10 +6159,10 @@ static const unsigned reduced_enums[1555] =
       1523, /* GL_QUERY_NO_WAIT */
       1519, /* GL_QUERY_BY_REGION_WAIT */
       1517, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2115, /* GL_TRANSFORM_FEEDBACK */
-      2124, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2118, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2116, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      2116, /* GL_TRANSFORM_FEEDBACK */
+      2125, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2119, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2117, /* GL_TRANSFORM_FEEDBACK_BINDING */
       1513, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
        545, /* GL_FIRST_VERTEX_CONVENTION */
        804, /* GL_LAST_VERTEX_CONVENTION */
@@ -6178,22 +6181,22 @@ static const unsigned reduced_enums[1555] =
       1602, /* GL_RG16_SNORM */
       1618, /* GL_RGB16_SNORM */
       1654, /* GL_RGBA16_SNORM */
-      1763, /* GL_SIGNED_NORMALIZED */
+      1764, /* GL_SIGNED_NORMALIZED */
       1444, /* GL_PRIMITIVE_RESTART */
       1445, /* GL_PRIMITIVE_RESTART_INDEX */
       1103, /* GL_MAX_SERVER_WAIT_TIMEOUT */
       1258, /* GL_OBJECT_TYPE */
-      1876, /* GL_SYNC_CONDITION */
-      1881, /* GL_SYNC_STATUS */
-      1878, /* GL_SYNC_FLAGS */
-      1877, /* GL_SYNC_FENCE */
-      1880, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2163, /* GL_UNSIGNALED */
-      1762, /* GL_SIGNALED */
+      1877, /* GL_SYNC_CONDITION */
+      1882, /* GL_SYNC_STATUS */
+      1879, /* GL_SYNC_FLAGS */
+      1878, /* GL_SYNC_FENCE */
+      1881, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2164, /* GL_UNSIGNALED */
+      1763, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2110, /* GL_TIMEOUT_EXPIRED */
+      2111, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2280, /* GL_WAIT_FAILED */
+      2281, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
@@ -6205,8 +6208,8 @@ static const unsigned reduced_enums[1555] =
        530, /* GL_EVAL_BIT */
       1538, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        851, /* GL_LIST_BIT */
-      1983, /* GL_TEXTURE_BIT */
-      1732, /* GL_SCISSOR_BIT */
+      1984, /* GL_TEXTURE_BIT */
+      1733, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
       1209, /* GL_MULTISAMPLE_BIT */
         31, /* GL_ALL_CLIENT_ATTRIB_BITS */
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index bf65a4f6485..43930a4b30e 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -439,9 +439,10 @@ static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )
       key->unit[i].source_index =
          translate_tex_src_bit(texUnit->_ReallyEnabled);
 
-      key->unit[i].shadow = ((texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
-                             ((format == GL_DEPTH_COMPONENT) || 
-                              (format == GL_DEPTH_STENCIL_EXT)));
+      key->unit[i].shadow =
+         ((texObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
+          ((format == GL_DEPTH_COMPONENT) || 
+           (format == GL_DEPTH_STENCIL_EXT)));
 
       key->unit[i].NumArgsRGB = comb->_NumArgsRGB;
       key->unit[i].NumArgsA = comb->_NumArgsA;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 6ef8c8792e6..e18803280c1 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -278,6 +278,11 @@ static const int extra_EXT_gpu_shader4[] = {
    EXTRA_END
 };
 
+static const int extra_ARB_sampler_objects[] = {
+   EXT(ARB_sampler_objects),
+   EXTRA_END
+};
+
 
 EXTRA_EXT(ARB_ES2_compatibility);
 EXTRA_EXT(ARB_multitexture);
@@ -1249,6 +1254,10 @@ static const struct value_desc values[] = {
    { GL_TEXTURE_BUFFER_ARB, LOC_CUSTOM, TYPE_INT, 0,
      extra_ARB_texture_buffer_object },
 
+   /* GL_ARB_sampler_objects / GL 3.3 */
+   { GL_SAMPLER_BINDING,
+     LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, extra_ARB_sampler_objects },
+
    /* GL 3.0 */
    { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 },
    { GL_MAJOR_VERSION, CONTEXT_INT(VersionMajor), extra_version_30 },
@@ -1709,6 +1718,14 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
          .CurrentTex[TEXTURE_BUFFER_INDEX]->BufferObjectFormat;
       break;
 
+   /* GL_ARB_sampler_objects */
+   case GL_SAMPLER_BINDING:
+      {
+         struct gl_sampler_object *samp =
+            ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler;
+         v->value_int = samp ? samp->Name : 0;
+      }
+      break;
    }   
 }
 
diff --git a/src/mesa/main/glapidispatch.h b/src/mesa/main/glapidispatch.h
index 4391a39fb2a..c1cc6cb1254 100644
--- a/src/mesa/main/glapidispatch.h
+++ b/src/mesa/main/glapidispatch.h
@@ -59,7 +59,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 894
+#define _gloffset_COUNT 908
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -664,304 +664,318 @@
 #define _gloffset_BlendEquationiARB 597
 #define _gloffset_BlendFuncSeparateiARB 598
 #define _gloffset_BlendFunciARB 599
-#define _gloffset_BindTransformFeedback 600
-#define _gloffset_DeleteTransformFeedbacks 601
-#define _gloffset_DrawTransformFeedback 602
-#define _gloffset_GenTransformFeedbacks 603
-#define _gloffset_IsTransformFeedback 604
-#define _gloffset_PauseTransformFeedback 605
-#define _gloffset_ResumeTransformFeedback 606
-#define _gloffset_ClearDepthf 607
-#define _gloffset_DepthRangef 608
-#define _gloffset_GetShaderPrecisionFormat 609
-#define _gloffset_ReleaseShaderCompiler 610
-#define _gloffset_ShaderBinary 611
-#define _gloffset_PolygonOffsetEXT 612
-#define _gloffset_GetPixelTexGenParameterfvSGIS 613
-#define _gloffset_GetPixelTexGenParameterivSGIS 614
-#define _gloffset_PixelTexGenParameterfSGIS 615
-#define _gloffset_PixelTexGenParameterfvSGIS 616
-#define _gloffset_PixelTexGenParameteriSGIS 617
-#define _gloffset_PixelTexGenParameterivSGIS 618
-#define _gloffset_SampleMaskSGIS 619
-#define _gloffset_SamplePatternSGIS 620
-#define _gloffset_ColorPointerEXT 621
-#define _gloffset_EdgeFlagPointerEXT 622
-#define _gloffset_IndexPointerEXT 623
-#define _gloffset_NormalPointerEXT 624
-#define _gloffset_TexCoordPointerEXT 625
-#define _gloffset_VertexPointerEXT 626
-#define _gloffset_PointParameterfEXT 627
-#define _gloffset_PointParameterfvEXT 628
-#define _gloffset_LockArraysEXT 629
-#define _gloffset_UnlockArraysEXT 630
-#define _gloffset_SecondaryColor3bEXT 631
-#define _gloffset_SecondaryColor3bvEXT 632
-#define _gloffset_SecondaryColor3dEXT 633
-#define _gloffset_SecondaryColor3dvEXT 634
-#define _gloffset_SecondaryColor3fEXT 635
-#define _gloffset_SecondaryColor3fvEXT 636
-#define _gloffset_SecondaryColor3iEXT 637
-#define _gloffset_SecondaryColor3ivEXT 638
-#define _gloffset_SecondaryColor3sEXT 639
-#define _gloffset_SecondaryColor3svEXT 640
-#define _gloffset_SecondaryColor3ubEXT 641
-#define _gloffset_SecondaryColor3ubvEXT 642
-#define _gloffset_SecondaryColor3uiEXT 643
-#define _gloffset_SecondaryColor3uivEXT 644
-#define _gloffset_SecondaryColor3usEXT 645
-#define _gloffset_SecondaryColor3usvEXT 646
-#define _gloffset_SecondaryColorPointerEXT 647
-#define _gloffset_MultiDrawArraysEXT 648
-#define _gloffset_MultiDrawElementsEXT 649
-#define _gloffset_FogCoordPointerEXT 650
-#define _gloffset_FogCoorddEXT 651
-#define _gloffset_FogCoorddvEXT 652
-#define _gloffset_FogCoordfEXT 653
-#define _gloffset_FogCoordfvEXT 654
-#define _gloffset_PixelTexGenSGIX 655
-#define _gloffset_BlendFuncSeparateEXT 656
-#define _gloffset_FlushVertexArrayRangeNV 657
-#define _gloffset_VertexArrayRangeNV 658
-#define _gloffset_CombinerInputNV 659
-#define _gloffset_CombinerOutputNV 660
-#define _gloffset_CombinerParameterfNV 661
-#define _gloffset_CombinerParameterfvNV 662
-#define _gloffset_CombinerParameteriNV 663
-#define _gloffset_CombinerParameterivNV 664
-#define _gloffset_FinalCombinerInputNV 665
-#define _gloffset_GetCombinerInputParameterfvNV 666
-#define _gloffset_GetCombinerInputParameterivNV 667
-#define _gloffset_GetCombinerOutputParameterfvNV 668
-#define _gloffset_GetCombinerOutputParameterivNV 669
-#define _gloffset_GetFinalCombinerInputParameterfvNV 670
-#define _gloffset_GetFinalCombinerInputParameterivNV 671
-#define _gloffset_ResizeBuffersMESA 672
-#define _gloffset_WindowPos2dMESA 673
-#define _gloffset_WindowPos2dvMESA 674
-#define _gloffset_WindowPos2fMESA 675
-#define _gloffset_WindowPos2fvMESA 676
-#define _gloffset_WindowPos2iMESA 677
-#define _gloffset_WindowPos2ivMESA 678
-#define _gloffset_WindowPos2sMESA 679
-#define _gloffset_WindowPos2svMESA 680
-#define _gloffset_WindowPos3dMESA 681
-#define _gloffset_WindowPos3dvMESA 682
-#define _gloffset_WindowPos3fMESA 683
-#define _gloffset_WindowPos3fvMESA 684
-#define _gloffset_WindowPos3iMESA 685
-#define _gloffset_WindowPos3ivMESA 686
-#define _gloffset_WindowPos3sMESA 687
-#define _gloffset_WindowPos3svMESA 688
-#define _gloffset_WindowPos4dMESA 689
-#define _gloffset_WindowPos4dvMESA 690
-#define _gloffset_WindowPos4fMESA 691
-#define _gloffset_WindowPos4fvMESA 692
-#define _gloffset_WindowPos4iMESA 693
-#define _gloffset_WindowPos4ivMESA 694
-#define _gloffset_WindowPos4sMESA 695
-#define _gloffset_WindowPos4svMESA 696
-#define _gloffset_MultiModeDrawArraysIBM 697
-#define _gloffset_MultiModeDrawElementsIBM 698
-#define _gloffset_DeleteFencesNV 699
-#define _gloffset_FinishFenceNV 700
-#define _gloffset_GenFencesNV 701
-#define _gloffset_GetFenceivNV 702
-#define _gloffset_IsFenceNV 703
-#define _gloffset_SetFenceNV 704
-#define _gloffset_TestFenceNV 705
-#define _gloffset_AreProgramsResidentNV 706
-#define _gloffset_BindProgramNV 707
-#define _gloffset_DeleteProgramsNV 708
-#define _gloffset_ExecuteProgramNV 709
-#define _gloffset_GenProgramsNV 710
-#define _gloffset_GetProgramParameterdvNV 711
-#define _gloffset_GetProgramParameterfvNV 712
-#define _gloffset_GetProgramStringNV 713
-#define _gloffset_GetProgramivNV 714
-#define _gloffset_GetTrackMatrixivNV 715
-#define _gloffset_GetVertexAttribPointervNV 716
-#define _gloffset_GetVertexAttribdvNV 717
-#define _gloffset_GetVertexAttribfvNV 718
-#define _gloffset_GetVertexAttribivNV 719
-#define _gloffset_IsProgramNV 720
-#define _gloffset_LoadProgramNV 721
-#define _gloffset_ProgramParameters4dvNV 722
-#define _gloffset_ProgramParameters4fvNV 723
-#define _gloffset_RequestResidentProgramsNV 724
-#define _gloffset_TrackMatrixNV 725
-#define _gloffset_VertexAttrib1dNV 726
-#define _gloffset_VertexAttrib1dvNV 727
-#define _gloffset_VertexAttrib1fNV 728
-#define _gloffset_VertexAttrib1fvNV 729
-#define _gloffset_VertexAttrib1sNV 730
-#define _gloffset_VertexAttrib1svNV 731
-#define _gloffset_VertexAttrib2dNV 732
-#define _gloffset_VertexAttrib2dvNV 733
-#define _gloffset_VertexAttrib2fNV 734
-#define _gloffset_VertexAttrib2fvNV 735
-#define _gloffset_VertexAttrib2sNV 736
-#define _gloffset_VertexAttrib2svNV 737
-#define _gloffset_VertexAttrib3dNV 738
-#define _gloffset_VertexAttrib3dvNV 739
-#define _gloffset_VertexAttrib3fNV 740
-#define _gloffset_VertexAttrib3fvNV 741
-#define _gloffset_VertexAttrib3sNV 742
-#define _gloffset_VertexAttrib3svNV 743
-#define _gloffset_VertexAttrib4dNV 744
-#define _gloffset_VertexAttrib4dvNV 745
-#define _gloffset_VertexAttrib4fNV 746
-#define _gloffset_VertexAttrib4fvNV 747
-#define _gloffset_VertexAttrib4sNV 748
-#define _gloffset_VertexAttrib4svNV 749
-#define _gloffset_VertexAttrib4ubNV 750
-#define _gloffset_VertexAttrib4ubvNV 751
-#define _gloffset_VertexAttribPointerNV 752
-#define _gloffset_VertexAttribs1dvNV 753
-#define _gloffset_VertexAttribs1fvNV 754
-#define _gloffset_VertexAttribs1svNV 755
-#define _gloffset_VertexAttribs2dvNV 756
-#define _gloffset_VertexAttribs2fvNV 757
-#define _gloffset_VertexAttribs2svNV 758
-#define _gloffset_VertexAttribs3dvNV 759
-#define _gloffset_VertexAttribs3fvNV 760
-#define _gloffset_VertexAttribs3svNV 761
-#define _gloffset_VertexAttribs4dvNV 762
-#define _gloffset_VertexAttribs4fvNV 763
-#define _gloffset_VertexAttribs4svNV 764
-#define _gloffset_VertexAttribs4ubvNV 765
-#define _gloffset_GetTexBumpParameterfvATI 766
-#define _gloffset_GetTexBumpParameterivATI 767
-#define _gloffset_TexBumpParameterfvATI 768
-#define _gloffset_TexBumpParameterivATI 769
-#define _gloffset_AlphaFragmentOp1ATI 770
-#define _gloffset_AlphaFragmentOp2ATI 771
-#define _gloffset_AlphaFragmentOp3ATI 772
-#define _gloffset_BeginFragmentShaderATI 773
-#define _gloffset_BindFragmentShaderATI 774
-#define _gloffset_ColorFragmentOp1ATI 775
-#define _gloffset_ColorFragmentOp2ATI 776
-#define _gloffset_ColorFragmentOp3ATI 777
-#define _gloffset_DeleteFragmentShaderATI 778
-#define _gloffset_EndFragmentShaderATI 779
-#define _gloffset_GenFragmentShadersATI 780
-#define _gloffset_PassTexCoordATI 781
-#define _gloffset_SampleMapATI 782
-#define _gloffset_SetFragmentShaderConstantATI 783
-#define _gloffset_PointParameteriNV 784
-#define _gloffset_PointParameterivNV 785
-#define _gloffset_ActiveStencilFaceEXT 786
-#define _gloffset_BindVertexArrayAPPLE 787
-#define _gloffset_DeleteVertexArraysAPPLE 788
-#define _gloffset_GenVertexArraysAPPLE 789
-#define _gloffset_IsVertexArrayAPPLE 790
-#define _gloffset_GetProgramNamedParameterdvNV 791
-#define _gloffset_GetProgramNamedParameterfvNV 792
-#define _gloffset_ProgramNamedParameter4dNV 793
-#define _gloffset_ProgramNamedParameter4dvNV 794
-#define _gloffset_ProgramNamedParameter4fNV 795
-#define _gloffset_ProgramNamedParameter4fvNV 796
-#define _gloffset_PrimitiveRestartIndexNV 797
-#define _gloffset_PrimitiveRestartNV 798
-#define _gloffset_DepthBoundsEXT 799
-#define _gloffset_BlendEquationSeparateEXT 800
-#define _gloffset_BindFramebufferEXT 801
-#define _gloffset_BindRenderbufferEXT 802
-#define _gloffset_CheckFramebufferStatusEXT 803
-#define _gloffset_DeleteFramebuffersEXT 804
-#define _gloffset_DeleteRenderbuffersEXT 805
-#define _gloffset_FramebufferRenderbufferEXT 806
-#define _gloffset_FramebufferTexture1DEXT 807
-#define _gloffset_FramebufferTexture2DEXT 808
-#define _gloffset_FramebufferTexture3DEXT 809
-#define _gloffset_GenFramebuffersEXT 810
-#define _gloffset_GenRenderbuffersEXT 811
-#define _gloffset_GenerateMipmapEXT 812
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 813
-#define _gloffset_GetRenderbufferParameterivEXT 814
-#define _gloffset_IsFramebufferEXT 815
-#define _gloffset_IsRenderbufferEXT 816
-#define _gloffset_RenderbufferStorageEXT 817
-#define _gloffset_BlitFramebufferEXT 818
-#define _gloffset_BufferParameteriAPPLE 819
-#define _gloffset_FlushMappedBufferRangeAPPLE 820
-#define _gloffset_BindFragDataLocationEXT 821
-#define _gloffset_GetFragDataLocationEXT 822
-#define _gloffset_GetUniformuivEXT 823
-#define _gloffset_GetVertexAttribIivEXT 824
-#define _gloffset_GetVertexAttribIuivEXT 825
-#define _gloffset_Uniform1uiEXT 826
-#define _gloffset_Uniform1uivEXT 827
-#define _gloffset_Uniform2uiEXT 828
-#define _gloffset_Uniform2uivEXT 829
-#define _gloffset_Uniform3uiEXT 830
-#define _gloffset_Uniform3uivEXT 831
-#define _gloffset_Uniform4uiEXT 832
-#define _gloffset_Uniform4uivEXT 833
-#define _gloffset_VertexAttribI1iEXT 834
-#define _gloffset_VertexAttribI1ivEXT 835
-#define _gloffset_VertexAttribI1uiEXT 836
-#define _gloffset_VertexAttribI1uivEXT 837
-#define _gloffset_VertexAttribI2iEXT 838
-#define _gloffset_VertexAttribI2ivEXT 839
-#define _gloffset_VertexAttribI2uiEXT 840
-#define _gloffset_VertexAttribI2uivEXT 841
-#define _gloffset_VertexAttribI3iEXT 842
-#define _gloffset_VertexAttribI3ivEXT 843
-#define _gloffset_VertexAttribI3uiEXT 844
-#define _gloffset_VertexAttribI3uivEXT 845
-#define _gloffset_VertexAttribI4bvEXT 846
-#define _gloffset_VertexAttribI4iEXT 847
-#define _gloffset_VertexAttribI4ivEXT 848
-#define _gloffset_VertexAttribI4svEXT 849
-#define _gloffset_VertexAttribI4ubvEXT 850
-#define _gloffset_VertexAttribI4uiEXT 851
-#define _gloffset_VertexAttribI4uivEXT 852
-#define _gloffset_VertexAttribI4usvEXT 853
-#define _gloffset_VertexAttribIPointerEXT 854
-#define _gloffset_FramebufferTextureLayerEXT 855
-#define _gloffset_ColorMaskIndexedEXT 856
-#define _gloffset_DisableIndexedEXT 857
-#define _gloffset_EnableIndexedEXT 858
-#define _gloffset_GetBooleanIndexedvEXT 859
-#define _gloffset_GetIntegerIndexedvEXT 860
-#define _gloffset_IsEnabledIndexedEXT 861
-#define _gloffset_ClearColorIiEXT 862
-#define _gloffset_ClearColorIuiEXT 863
-#define _gloffset_GetTexParameterIivEXT 864
-#define _gloffset_GetTexParameterIuivEXT 865
-#define _gloffset_TexParameterIivEXT 866
-#define _gloffset_TexParameterIuivEXT 867
-#define _gloffset_BeginConditionalRenderNV 868
-#define _gloffset_EndConditionalRenderNV 869
-#define _gloffset_BeginTransformFeedbackEXT 870
-#define _gloffset_BindBufferBaseEXT 871
-#define _gloffset_BindBufferOffsetEXT 872
-#define _gloffset_BindBufferRangeEXT 873
-#define _gloffset_EndTransformFeedbackEXT 874
-#define _gloffset_GetTransformFeedbackVaryingEXT 875
-#define _gloffset_TransformFeedbackVaryingsEXT 876
-#define _gloffset_ProvokingVertexEXT 877
-#define _gloffset_GetTexParameterPointervAPPLE 878
-#define _gloffset_TextureRangeAPPLE 879
-#define _gloffset_GetObjectParameterivAPPLE 880
-#define _gloffset_ObjectPurgeableAPPLE 881
-#define _gloffset_ObjectUnpurgeableAPPLE 882
-#define _gloffset_ActiveProgramEXT 883
-#define _gloffset_CreateShaderProgramEXT 884
-#define _gloffset_UseShaderProgramEXT 885
-#define _gloffset_TextureBarrierNV 886
-#define _gloffset_StencilFuncSeparateATI 887
-#define _gloffset_ProgramEnvParameters4fvEXT 888
-#define _gloffset_ProgramLocalParameters4fvEXT 889
-#define _gloffset_GetQueryObjecti64vEXT 890
-#define _gloffset_GetQueryObjectui64vEXT 891
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 892
-#define _gloffset_EGLImageTargetTexture2DOES 893
+#define _gloffset_BindSampler 600
+#define _gloffset_DeleteSamplers 601
+#define _gloffset_GenSamplers 602
+#define _gloffset_GetSamplerParameterIiv 603
+#define _gloffset_GetSamplerParameterIuiv 604
+#define _gloffset_GetSamplerParameterfv 605
+#define _gloffset_GetSamplerParameteriv 606
+#define _gloffset_IsSampler 607
+#define _gloffset_SamplerParameterIiv 608
+#define _gloffset_SamplerParameterIuiv 609
+#define _gloffset_SamplerParameterf 610
+#define _gloffset_SamplerParameterfv 611
+#define _gloffset_SamplerParameteri 612
+#define _gloffset_SamplerParameteriv 613
+#define _gloffset_BindTransformFeedback 614
+#define _gloffset_DeleteTransformFeedbacks 615
+#define _gloffset_DrawTransformFeedback 616
+#define _gloffset_GenTransformFeedbacks 617
+#define _gloffset_IsTransformFeedback 618
+#define _gloffset_PauseTransformFeedback 619
+#define _gloffset_ResumeTransformFeedback 620
+#define _gloffset_ClearDepthf 621
+#define _gloffset_DepthRangef 622
+#define _gloffset_GetShaderPrecisionFormat 623
+#define _gloffset_ReleaseShaderCompiler 624
+#define _gloffset_ShaderBinary 625
+#define _gloffset_PolygonOffsetEXT 626
+#define _gloffset_GetPixelTexGenParameterfvSGIS 627
+#define _gloffset_GetPixelTexGenParameterivSGIS 628
+#define _gloffset_PixelTexGenParameterfSGIS 629
+#define _gloffset_PixelTexGenParameterfvSGIS 630
+#define _gloffset_PixelTexGenParameteriSGIS 631
+#define _gloffset_PixelTexGenParameterivSGIS 632
+#define _gloffset_SampleMaskSGIS 633
+#define _gloffset_SamplePatternSGIS 634
+#define _gloffset_ColorPointerEXT 635
+#define _gloffset_EdgeFlagPointerEXT 636
+#define _gloffset_IndexPointerEXT 637
+#define _gloffset_NormalPointerEXT 638
+#define _gloffset_TexCoordPointerEXT 639
+#define _gloffset_VertexPointerEXT 640
+#define _gloffset_PointParameterfEXT 641
+#define _gloffset_PointParameterfvEXT 642
+#define _gloffset_LockArraysEXT 643
+#define _gloffset_UnlockArraysEXT 644
+#define _gloffset_SecondaryColor3bEXT 645
+#define _gloffset_SecondaryColor3bvEXT 646
+#define _gloffset_SecondaryColor3dEXT 647
+#define _gloffset_SecondaryColor3dvEXT 648
+#define _gloffset_SecondaryColor3fEXT 649
+#define _gloffset_SecondaryColor3fvEXT 650
+#define _gloffset_SecondaryColor3iEXT 651
+#define _gloffset_SecondaryColor3ivEXT 652
+#define _gloffset_SecondaryColor3sEXT 653
+#define _gloffset_SecondaryColor3svEXT 654
+#define _gloffset_SecondaryColor3ubEXT 655
+#define _gloffset_SecondaryColor3ubvEXT 656
+#define _gloffset_SecondaryColor3uiEXT 657
+#define _gloffset_SecondaryColor3uivEXT 658
+#define _gloffset_SecondaryColor3usEXT 659
+#define _gloffset_SecondaryColor3usvEXT 660
+#define _gloffset_SecondaryColorPointerEXT 661
+#define _gloffset_MultiDrawArraysEXT 662
+#define _gloffset_MultiDrawElementsEXT 663
+#define _gloffset_FogCoordPointerEXT 664
+#define _gloffset_FogCoorddEXT 665
+#define _gloffset_FogCoorddvEXT 666
+#define _gloffset_FogCoordfEXT 667
+#define _gloffset_FogCoordfvEXT 668
+#define _gloffset_PixelTexGenSGIX 669
+#define _gloffset_BlendFuncSeparateEXT 670
+#define _gloffset_FlushVertexArrayRangeNV 671
+#define _gloffset_VertexArrayRangeNV 672
+#define _gloffset_CombinerInputNV 673
+#define _gloffset_CombinerOutputNV 674
+#define _gloffset_CombinerParameterfNV 675
+#define _gloffset_CombinerParameterfvNV 676
+#define _gloffset_CombinerParameteriNV 677
+#define _gloffset_CombinerParameterivNV 678
+#define _gloffset_FinalCombinerInputNV 679
+#define _gloffset_GetCombinerInputParameterfvNV 680
+#define _gloffset_GetCombinerInputParameterivNV 681
+#define _gloffset_GetCombinerOutputParameterfvNV 682
+#define _gloffset_GetCombinerOutputParameterivNV 683
+#define _gloffset_GetFinalCombinerInputParameterfvNV 684
+#define _gloffset_GetFinalCombinerInputParameterivNV 685
+#define _gloffset_ResizeBuffersMESA 686
+#define _gloffset_WindowPos2dMESA 687
+#define _gloffset_WindowPos2dvMESA 688
+#define _gloffset_WindowPos2fMESA 689
+#define _gloffset_WindowPos2fvMESA 690
+#define _gloffset_WindowPos2iMESA 691
+#define _gloffset_WindowPos2ivMESA 692
+#define _gloffset_WindowPos2sMESA 693
+#define _gloffset_WindowPos2svMESA 694
+#define _gloffset_WindowPos3dMESA 695
+#define _gloffset_WindowPos3dvMESA 696
+#define _gloffset_WindowPos3fMESA 697
+#define _gloffset_WindowPos3fvMESA 698
+#define _gloffset_WindowPos3iMESA 699
+#define _gloffset_WindowPos3ivMESA 700
+#define _gloffset_WindowPos3sMESA 701
+#define _gloffset_WindowPos3svMESA 702
+#define _gloffset_WindowPos4dMESA 703
+#define _gloffset_WindowPos4dvMESA 704
+#define _gloffset_WindowPos4fMESA 705
+#define _gloffset_WindowPos4fvMESA 706
+#define _gloffset_WindowPos4iMESA 707
+#define _gloffset_WindowPos4ivMESA 708
+#define _gloffset_WindowPos4sMESA 709
+#define _gloffset_WindowPos4svMESA 710
+#define _gloffset_MultiModeDrawArraysIBM 711
+#define _gloffset_MultiModeDrawElementsIBM 712
+#define _gloffset_DeleteFencesNV 713
+#define _gloffset_FinishFenceNV 714
+#define _gloffset_GenFencesNV 715
+#define _gloffset_GetFenceivNV 716
+#define _gloffset_IsFenceNV 717
+#define _gloffset_SetFenceNV 718
+#define _gloffset_TestFenceNV 719
+#define _gloffset_AreProgramsResidentNV 720
+#define _gloffset_BindProgramNV 721
+#define _gloffset_DeleteProgramsNV 722
+#define _gloffset_ExecuteProgramNV 723
+#define _gloffset_GenProgramsNV 724
+#define _gloffset_GetProgramParameterdvNV 725
+#define _gloffset_GetProgramParameterfvNV 726
+#define _gloffset_GetProgramStringNV 727
+#define _gloffset_GetProgramivNV 728
+#define _gloffset_GetTrackMatrixivNV 729
+#define _gloffset_GetVertexAttribPointervNV 730
+#define _gloffset_GetVertexAttribdvNV 731
+#define _gloffset_GetVertexAttribfvNV 732
+#define _gloffset_GetVertexAttribivNV 733
+#define _gloffset_IsProgramNV 734
+#define _gloffset_LoadProgramNV 735
+#define _gloffset_ProgramParameters4dvNV 736
+#define _gloffset_ProgramParameters4fvNV 737
+#define _gloffset_RequestResidentProgramsNV 738
+#define _gloffset_TrackMatrixNV 739
+#define _gloffset_VertexAttrib1dNV 740
+#define _gloffset_VertexAttrib1dvNV 741
+#define _gloffset_VertexAttrib1fNV 742
+#define _gloffset_VertexAttrib1fvNV 743
+#define _gloffset_VertexAttrib1sNV 744
+#define _gloffset_VertexAttrib1svNV 745
+#define _gloffset_VertexAttrib2dNV 746
+#define _gloffset_VertexAttrib2dvNV 747
+#define _gloffset_VertexAttrib2fNV 748
+#define _gloffset_VertexAttrib2fvNV 749
+#define _gloffset_VertexAttrib2sNV 750
+#define _gloffset_VertexAttrib2svNV 751
+#define _gloffset_VertexAttrib3dNV 752
+#define _gloffset_VertexAttrib3dvNV 753
+#define _gloffset_VertexAttrib3fNV 754
+#define _gloffset_VertexAttrib3fvNV 755
+#define _gloffset_VertexAttrib3sNV 756
+#define _gloffset_VertexAttrib3svNV 757
+#define _gloffset_VertexAttrib4dNV 758
+#define _gloffset_VertexAttrib4dvNV 759
+#define _gloffset_VertexAttrib4fNV 760
+#define _gloffset_VertexAttrib4fvNV 761
+#define _gloffset_VertexAttrib4sNV 762
+#define _gloffset_VertexAttrib4svNV 763
+#define _gloffset_VertexAttrib4ubNV 764
+#define _gloffset_VertexAttrib4ubvNV 765
+#define _gloffset_VertexAttribPointerNV 766
+#define _gloffset_VertexAttribs1dvNV 767
+#define _gloffset_VertexAttribs1fvNV 768
+#define _gloffset_VertexAttribs1svNV 769
+#define _gloffset_VertexAttribs2dvNV 770
+#define _gloffset_VertexAttribs2fvNV 771
+#define _gloffset_VertexAttribs2svNV 772
+#define _gloffset_VertexAttribs3dvNV 773
+#define _gloffset_VertexAttribs3fvNV 774
+#define _gloffset_VertexAttribs3svNV 775
+#define _gloffset_VertexAttribs4dvNV 776
+#define _gloffset_VertexAttribs4fvNV 777
+#define _gloffset_VertexAttribs4svNV 778
+#define _gloffset_VertexAttribs4ubvNV 779
+#define _gloffset_GetTexBumpParameterfvATI 780
+#define _gloffset_GetTexBumpParameterivATI 781
+#define _gloffset_TexBumpParameterfvATI 782
+#define _gloffset_TexBumpParameterivATI 783
+#define _gloffset_AlphaFragmentOp1ATI 784
+#define _gloffset_AlphaFragmentOp2ATI 785
+#define _gloffset_AlphaFragmentOp3ATI 786
+#define _gloffset_BeginFragmentShaderATI 787
+#define _gloffset_BindFragmentShaderATI 788
+#define _gloffset_ColorFragmentOp1ATI 789
+#define _gloffset_ColorFragmentOp2ATI 790
+#define _gloffset_ColorFragmentOp3ATI 791
+#define _gloffset_DeleteFragmentShaderATI 792
+#define _gloffset_EndFragmentShaderATI 793
+#define _gloffset_GenFragmentShadersATI 794
+#define _gloffset_PassTexCoordATI 795
+#define _gloffset_SampleMapATI 796
+#define _gloffset_SetFragmentShaderConstantATI 797
+#define _gloffset_PointParameteriNV 798
+#define _gloffset_PointParameterivNV 799
+#define _gloffset_ActiveStencilFaceEXT 800
+#define _gloffset_BindVertexArrayAPPLE 801
+#define _gloffset_DeleteVertexArraysAPPLE 802
+#define _gloffset_GenVertexArraysAPPLE 803
+#define _gloffset_IsVertexArrayAPPLE 804
+#define _gloffset_GetProgramNamedParameterdvNV 805
+#define _gloffset_GetProgramNamedParameterfvNV 806
+#define _gloffset_ProgramNamedParameter4dNV 807
+#define _gloffset_ProgramNamedParameter4dvNV 808
+#define _gloffset_ProgramNamedParameter4fNV 809
+#define _gloffset_ProgramNamedParameter4fvNV 810
+#define _gloffset_PrimitiveRestartIndexNV 811
+#define _gloffset_PrimitiveRestartNV 812
+#define _gloffset_DepthBoundsEXT 813
+#define _gloffset_BlendEquationSeparateEXT 814
+#define _gloffset_BindFramebufferEXT 815
+#define _gloffset_BindRenderbufferEXT 816
+#define _gloffset_CheckFramebufferStatusEXT 817
+#define _gloffset_DeleteFramebuffersEXT 818
+#define _gloffset_DeleteRenderbuffersEXT 819
+#define _gloffset_FramebufferRenderbufferEXT 820
+#define _gloffset_FramebufferTexture1DEXT 821
+#define _gloffset_FramebufferTexture2DEXT 822
+#define _gloffset_FramebufferTexture3DEXT 823
+#define _gloffset_GenFramebuffersEXT 824
+#define _gloffset_GenRenderbuffersEXT 825
+#define _gloffset_GenerateMipmapEXT 826
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 827
+#define _gloffset_GetRenderbufferParameterivEXT 828
+#define _gloffset_IsFramebufferEXT 829
+#define _gloffset_IsRenderbufferEXT 830
+#define _gloffset_RenderbufferStorageEXT 831
+#define _gloffset_BlitFramebufferEXT 832
+#define _gloffset_BufferParameteriAPPLE 833
+#define _gloffset_FlushMappedBufferRangeAPPLE 834
+#define _gloffset_BindFragDataLocationEXT 835
+#define _gloffset_GetFragDataLocationEXT 836
+#define _gloffset_GetUniformuivEXT 837
+#define _gloffset_GetVertexAttribIivEXT 838
+#define _gloffset_GetVertexAttribIuivEXT 839
+#define _gloffset_Uniform1uiEXT 840
+#define _gloffset_Uniform1uivEXT 841
+#define _gloffset_Uniform2uiEXT 842
+#define _gloffset_Uniform2uivEXT 843
+#define _gloffset_Uniform3uiEXT 844
+#define _gloffset_Uniform3uivEXT 845
+#define _gloffset_Uniform4uiEXT 846
+#define _gloffset_Uniform4uivEXT 847
+#define _gloffset_VertexAttribI1iEXT 848
+#define _gloffset_VertexAttribI1ivEXT 849
+#define _gloffset_VertexAttribI1uiEXT 850
+#define _gloffset_VertexAttribI1uivEXT 851
+#define _gloffset_VertexAttribI2iEXT 852
+#define _gloffset_VertexAttribI2ivEXT 853
+#define _gloffset_VertexAttribI2uiEXT 854
+#define _gloffset_VertexAttribI2uivEXT 855
+#define _gloffset_VertexAttribI3iEXT 856
+#define _gloffset_VertexAttribI3ivEXT 857
+#define _gloffset_VertexAttribI3uiEXT 858
+#define _gloffset_VertexAttribI3uivEXT 859
+#define _gloffset_VertexAttribI4bvEXT 860
+#define _gloffset_VertexAttribI4iEXT 861
+#define _gloffset_VertexAttribI4ivEXT 862
+#define _gloffset_VertexAttribI4svEXT 863
+#define _gloffset_VertexAttribI4ubvEXT 864
+#define _gloffset_VertexAttribI4uiEXT 865
+#define _gloffset_VertexAttribI4uivEXT 866
+#define _gloffset_VertexAttribI4usvEXT 867
+#define _gloffset_VertexAttribIPointerEXT 868
+#define _gloffset_FramebufferTextureLayerEXT 869
+#define _gloffset_ColorMaskIndexedEXT 870
+#define _gloffset_DisableIndexedEXT 871
+#define _gloffset_EnableIndexedEXT 872
+#define _gloffset_GetBooleanIndexedvEXT 873
+#define _gloffset_GetIntegerIndexedvEXT 874
+#define _gloffset_IsEnabledIndexedEXT 875
+#define _gloffset_ClearColorIiEXT 876
+#define _gloffset_ClearColorIuiEXT 877
+#define _gloffset_GetTexParameterIivEXT 878
+#define _gloffset_GetTexParameterIuivEXT 879
+#define _gloffset_TexParameterIivEXT 880
+#define _gloffset_TexParameterIuivEXT 881
+#define _gloffset_BeginConditionalRenderNV 882
+#define _gloffset_EndConditionalRenderNV 883
+#define _gloffset_BeginTransformFeedbackEXT 884
+#define _gloffset_BindBufferBaseEXT 885
+#define _gloffset_BindBufferOffsetEXT 886
+#define _gloffset_BindBufferRangeEXT 887
+#define _gloffset_EndTransformFeedbackEXT 888
+#define _gloffset_GetTransformFeedbackVaryingEXT 889
+#define _gloffset_TransformFeedbackVaryingsEXT 890
+#define _gloffset_ProvokingVertexEXT 891
+#define _gloffset_GetTexParameterPointervAPPLE 892
+#define _gloffset_TextureRangeAPPLE 893
+#define _gloffset_GetObjectParameterivAPPLE 894
+#define _gloffset_ObjectPurgeableAPPLE 895
+#define _gloffset_ObjectUnpurgeableAPPLE 896
+#define _gloffset_ActiveProgramEXT 897
+#define _gloffset_CreateShaderProgramEXT 898
+#define _gloffset_UseShaderProgramEXT 899
+#define _gloffset_TextureBarrierNV 900
+#define _gloffset_StencilFuncSeparateATI 901
+#define _gloffset_ProgramEnvParameters4fvEXT 902
+#define _gloffset_ProgramLocalParameters4fvEXT 903
+#define _gloffset_GetQueryObjecti64vEXT 904
+#define _gloffset_GetQueryObjectui64vEXT 905
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 906
+#define _gloffset_EGLImageTargetTexture2DOES 907
 
 #else /* !_GLAPI_USE_REMAP_TABLE */
 
-#define driDispatchRemapTable_size 486
+#define driDispatchRemapTable_size 500
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1156,300 +1170,314 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BlendEquationiARB_remap_index 189
 #define BlendFuncSeparateiARB_remap_index 190
 #define BlendFunciARB_remap_index 191
-#define BindTransformFeedback_remap_index 192
-#define DeleteTransformFeedbacks_remap_index 193
-#define DrawTransformFeedback_remap_index 194
-#define GenTransformFeedbacks_remap_index 195
-#define IsTransformFeedback_remap_index 196
-#define PauseTransformFeedback_remap_index 197
-#define ResumeTransformFeedback_remap_index 198
-#define ClearDepthf_remap_index 199
-#define DepthRangef_remap_index 200
-#define GetShaderPrecisionFormat_remap_index 201
-#define ReleaseShaderCompiler_remap_index 202
-#define ShaderBinary_remap_index 203
-#define PolygonOffsetEXT_remap_index 204
-#define GetPixelTexGenParameterfvSGIS_remap_index 205
-#define GetPixelTexGenParameterivSGIS_remap_index 206
-#define PixelTexGenParameterfSGIS_remap_index 207
-#define PixelTexGenParameterfvSGIS_remap_index 208
-#define PixelTexGenParameteriSGIS_remap_index 209
-#define PixelTexGenParameterivSGIS_remap_index 210
-#define SampleMaskSGIS_remap_index 211
-#define SamplePatternSGIS_remap_index 212
-#define ColorPointerEXT_remap_index 213
-#define EdgeFlagPointerEXT_remap_index 214
-#define IndexPointerEXT_remap_index 215
-#define NormalPointerEXT_remap_index 216
-#define TexCoordPointerEXT_remap_index 217
-#define VertexPointerEXT_remap_index 218
-#define PointParameterfEXT_remap_index 219
-#define PointParameterfvEXT_remap_index 220
-#define LockArraysEXT_remap_index 221
-#define UnlockArraysEXT_remap_index 222
-#define SecondaryColor3bEXT_remap_index 223
-#define SecondaryColor3bvEXT_remap_index 224
-#define SecondaryColor3dEXT_remap_index 225
-#define SecondaryColor3dvEXT_remap_index 226
-#define SecondaryColor3fEXT_remap_index 227
-#define SecondaryColor3fvEXT_remap_index 228
-#define SecondaryColor3iEXT_remap_index 229
-#define SecondaryColor3ivEXT_remap_index 230
-#define SecondaryColor3sEXT_remap_index 231
-#define SecondaryColor3svEXT_remap_index 232
-#define SecondaryColor3ubEXT_remap_index 233
-#define SecondaryColor3ubvEXT_remap_index 234
-#define SecondaryColor3uiEXT_remap_index 235
-#define SecondaryColor3uivEXT_remap_index 236
-#define SecondaryColor3usEXT_remap_index 237
-#define SecondaryColor3usvEXT_remap_index 238
-#define SecondaryColorPointerEXT_remap_index 239
-#define MultiDrawArraysEXT_remap_index 240
-#define MultiDrawElementsEXT_remap_index 241
-#define FogCoordPointerEXT_remap_index 242
-#define FogCoorddEXT_remap_index 243
-#define FogCoorddvEXT_remap_index 244
-#define FogCoordfEXT_remap_index 245
-#define FogCoordfvEXT_remap_index 246
-#define PixelTexGenSGIX_remap_index 247
-#define BlendFuncSeparateEXT_remap_index 248
-#define FlushVertexArrayRangeNV_remap_index 249
-#define VertexArrayRangeNV_remap_index 250
-#define CombinerInputNV_remap_index 251
-#define CombinerOutputNV_remap_index 252
-#define CombinerParameterfNV_remap_index 253
-#define CombinerParameterfvNV_remap_index 254
-#define CombinerParameteriNV_remap_index 255
-#define CombinerParameterivNV_remap_index 256
-#define FinalCombinerInputNV_remap_index 257
-#define GetCombinerInputParameterfvNV_remap_index 258
-#define GetCombinerInputParameterivNV_remap_index 259
-#define GetCombinerOutputParameterfvNV_remap_index 260
-#define GetCombinerOutputParameterivNV_remap_index 261
-#define GetFinalCombinerInputParameterfvNV_remap_index 262
-#define GetFinalCombinerInputParameterivNV_remap_index 263
-#define ResizeBuffersMESA_remap_index 264
-#define WindowPos2dMESA_remap_index 265
-#define WindowPos2dvMESA_remap_index 266
-#define WindowPos2fMESA_remap_index 267
-#define WindowPos2fvMESA_remap_index 268
-#define WindowPos2iMESA_remap_index 269
-#define WindowPos2ivMESA_remap_index 270
-#define WindowPos2sMESA_remap_index 271
-#define WindowPos2svMESA_remap_index 272
-#define WindowPos3dMESA_remap_index 273
-#define WindowPos3dvMESA_remap_index 274
-#define WindowPos3fMESA_remap_index 275
-#define WindowPos3fvMESA_remap_index 276
-#define WindowPos3iMESA_remap_index 277
-#define WindowPos3ivMESA_remap_index 278
-#define WindowPos3sMESA_remap_index 279
-#define WindowPos3svMESA_remap_index 280
-#define WindowPos4dMESA_remap_index 281
-#define WindowPos4dvMESA_remap_index 282
-#define WindowPos4fMESA_remap_index 283
-#define WindowPos4fvMESA_remap_index 284
-#define WindowPos4iMESA_remap_index 285
-#define WindowPos4ivMESA_remap_index 286
-#define WindowPos4sMESA_remap_index 287
-#define WindowPos4svMESA_remap_index 288
-#define MultiModeDrawArraysIBM_remap_index 289
-#define MultiModeDrawElementsIBM_remap_index 290
-#define DeleteFencesNV_remap_index 291
-#define FinishFenceNV_remap_index 292
-#define GenFencesNV_remap_index 293
-#define GetFenceivNV_remap_index 294
-#define IsFenceNV_remap_index 295
-#define SetFenceNV_remap_index 296
-#define TestFenceNV_remap_index 297
-#define AreProgramsResidentNV_remap_index 298
-#define BindProgramNV_remap_index 299
-#define DeleteProgramsNV_remap_index 300
-#define ExecuteProgramNV_remap_index 301
-#define GenProgramsNV_remap_index 302
-#define GetProgramParameterdvNV_remap_index 303
-#define GetProgramParameterfvNV_remap_index 304
-#define GetProgramStringNV_remap_index 305
-#define GetProgramivNV_remap_index 306
-#define GetTrackMatrixivNV_remap_index 307
-#define GetVertexAttribPointervNV_remap_index 308
-#define GetVertexAttribdvNV_remap_index 309
-#define GetVertexAttribfvNV_remap_index 310
-#define GetVertexAttribivNV_remap_index 311
-#define IsProgramNV_remap_index 312
-#define LoadProgramNV_remap_index 313
-#define ProgramParameters4dvNV_remap_index 314
-#define ProgramParameters4fvNV_remap_index 315
-#define RequestResidentProgramsNV_remap_index 316
-#define TrackMatrixNV_remap_index 317
-#define VertexAttrib1dNV_remap_index 318
-#define VertexAttrib1dvNV_remap_index 319
-#define VertexAttrib1fNV_remap_index 320
-#define VertexAttrib1fvNV_remap_index 321
-#define VertexAttrib1sNV_remap_index 322
-#define VertexAttrib1svNV_remap_index 323
-#define VertexAttrib2dNV_remap_index 324
-#define VertexAttrib2dvNV_remap_index 325
-#define VertexAttrib2fNV_remap_index 326
-#define VertexAttrib2fvNV_remap_index 327
-#define VertexAttrib2sNV_remap_index 328
-#define VertexAttrib2svNV_remap_index 329
-#define VertexAttrib3dNV_remap_index 330
-#define VertexAttrib3dvNV_remap_index 331
-#define VertexAttrib3fNV_remap_index 332
-#define VertexAttrib3fvNV_remap_index 333
-#define VertexAttrib3sNV_remap_index 334
-#define VertexAttrib3svNV_remap_index 335
-#define VertexAttrib4dNV_remap_index 336
-#define VertexAttrib4dvNV_remap_index 337
-#define VertexAttrib4fNV_remap_index 338
-#define VertexAttrib4fvNV_remap_index 339
-#define VertexAttrib4sNV_remap_index 340
-#define VertexAttrib4svNV_remap_index 341
-#define VertexAttrib4ubNV_remap_index 342
-#define VertexAttrib4ubvNV_remap_index 343
-#define VertexAttribPointerNV_remap_index 344
-#define VertexAttribs1dvNV_remap_index 345
-#define VertexAttribs1fvNV_remap_index 346
-#define VertexAttribs1svNV_remap_index 347
-#define VertexAttribs2dvNV_remap_index 348
-#define VertexAttribs2fvNV_remap_index 349
-#define VertexAttribs2svNV_remap_index 350
-#define VertexAttribs3dvNV_remap_index 351
-#define VertexAttribs3fvNV_remap_index 352
-#define VertexAttribs3svNV_remap_index 353
-#define VertexAttribs4dvNV_remap_index 354
-#define VertexAttribs4fvNV_remap_index 355
-#define VertexAttribs4svNV_remap_index 356
-#define VertexAttribs4ubvNV_remap_index 357
-#define GetTexBumpParameterfvATI_remap_index 358
-#define GetTexBumpParameterivATI_remap_index 359
-#define TexBumpParameterfvATI_remap_index 360
-#define TexBumpParameterivATI_remap_index 361
-#define AlphaFragmentOp1ATI_remap_index 362
-#define AlphaFragmentOp2ATI_remap_index 363
-#define AlphaFragmentOp3ATI_remap_index 364
-#define BeginFragmentShaderATI_remap_index 365
-#define BindFragmentShaderATI_remap_index 366
-#define ColorFragmentOp1ATI_remap_index 367
-#define ColorFragmentOp2ATI_remap_index 368
-#define ColorFragmentOp3ATI_remap_index 369
-#define DeleteFragmentShaderATI_remap_index 370
-#define EndFragmentShaderATI_remap_index 371
-#define GenFragmentShadersATI_remap_index 372
-#define PassTexCoordATI_remap_index 373
-#define SampleMapATI_remap_index 374
-#define SetFragmentShaderConstantATI_remap_index 375
-#define PointParameteriNV_remap_index 376
-#define PointParameterivNV_remap_index 377
-#define ActiveStencilFaceEXT_remap_index 378
-#define BindVertexArrayAPPLE_remap_index 379
-#define DeleteVertexArraysAPPLE_remap_index 380
-#define GenVertexArraysAPPLE_remap_index 381
-#define IsVertexArrayAPPLE_remap_index 382
-#define GetProgramNamedParameterdvNV_remap_index 383
-#define GetProgramNamedParameterfvNV_remap_index 384
-#define ProgramNamedParameter4dNV_remap_index 385
-#define ProgramNamedParameter4dvNV_remap_index 386
-#define ProgramNamedParameter4fNV_remap_index 387
-#define ProgramNamedParameter4fvNV_remap_index 388
-#define PrimitiveRestartIndexNV_remap_index 389
-#define PrimitiveRestartNV_remap_index 390
-#define DepthBoundsEXT_remap_index 391
-#define BlendEquationSeparateEXT_remap_index 392
-#define BindFramebufferEXT_remap_index 393
-#define BindRenderbufferEXT_remap_index 394
-#define CheckFramebufferStatusEXT_remap_index 395
-#define DeleteFramebuffersEXT_remap_index 396
-#define DeleteRenderbuffersEXT_remap_index 397
-#define FramebufferRenderbufferEXT_remap_index 398
-#define FramebufferTexture1DEXT_remap_index 399
-#define FramebufferTexture2DEXT_remap_index 400
-#define FramebufferTexture3DEXT_remap_index 401
-#define GenFramebuffersEXT_remap_index 402
-#define GenRenderbuffersEXT_remap_index 403
-#define GenerateMipmapEXT_remap_index 404
-#define GetFramebufferAttachmentParameterivEXT_remap_index 405
-#define GetRenderbufferParameterivEXT_remap_index 406
-#define IsFramebufferEXT_remap_index 407
-#define IsRenderbufferEXT_remap_index 408
-#define RenderbufferStorageEXT_remap_index 409
-#define BlitFramebufferEXT_remap_index 410
-#define BufferParameteriAPPLE_remap_index 411
-#define FlushMappedBufferRangeAPPLE_remap_index 412
-#define BindFragDataLocationEXT_remap_index 413
-#define GetFragDataLocationEXT_remap_index 414
-#define GetUniformuivEXT_remap_index 415
-#define GetVertexAttribIivEXT_remap_index 416
-#define GetVertexAttribIuivEXT_remap_index 417
-#define Uniform1uiEXT_remap_index 418
-#define Uniform1uivEXT_remap_index 419
-#define Uniform2uiEXT_remap_index 420
-#define Uniform2uivEXT_remap_index 421
-#define Uniform3uiEXT_remap_index 422
-#define Uniform3uivEXT_remap_index 423
-#define Uniform4uiEXT_remap_index 424
-#define Uniform4uivEXT_remap_index 425
-#define VertexAttribI1iEXT_remap_index 426
-#define VertexAttribI1ivEXT_remap_index 427
-#define VertexAttribI1uiEXT_remap_index 428
-#define VertexAttribI1uivEXT_remap_index 429
-#define VertexAttribI2iEXT_remap_index 430
-#define VertexAttribI2ivEXT_remap_index 431
-#define VertexAttribI2uiEXT_remap_index 432
-#define VertexAttribI2uivEXT_remap_index 433
-#define VertexAttribI3iEXT_remap_index 434
-#define VertexAttribI3ivEXT_remap_index 435
-#define VertexAttribI3uiEXT_remap_index 436
-#define VertexAttribI3uivEXT_remap_index 437
-#define VertexAttribI4bvEXT_remap_index 438
-#define VertexAttribI4iEXT_remap_index 439
-#define VertexAttribI4ivEXT_remap_index 440
-#define VertexAttribI4svEXT_remap_index 441
-#define VertexAttribI4ubvEXT_remap_index 442
-#define VertexAttribI4uiEXT_remap_index 443
-#define VertexAttribI4uivEXT_remap_index 444
-#define VertexAttribI4usvEXT_remap_index 445
-#define VertexAttribIPointerEXT_remap_index 446
-#define FramebufferTextureLayerEXT_remap_index 447
-#define ColorMaskIndexedEXT_remap_index 448
-#define DisableIndexedEXT_remap_index 449
-#define EnableIndexedEXT_remap_index 450
-#define GetBooleanIndexedvEXT_remap_index 451
-#define GetIntegerIndexedvEXT_remap_index 452
-#define IsEnabledIndexedEXT_remap_index 453
-#define ClearColorIiEXT_remap_index 454
-#define ClearColorIuiEXT_remap_index 455
-#define GetTexParameterIivEXT_remap_index 456
-#define GetTexParameterIuivEXT_remap_index 457
-#define TexParameterIivEXT_remap_index 458
-#define TexParameterIuivEXT_remap_index 459
-#define BeginConditionalRenderNV_remap_index 460
-#define EndConditionalRenderNV_remap_index 461
-#define BeginTransformFeedbackEXT_remap_index 462
-#define BindBufferBaseEXT_remap_index 463
-#define BindBufferOffsetEXT_remap_index 464
-#define BindBufferRangeEXT_remap_index 465
-#define EndTransformFeedbackEXT_remap_index 466
-#define GetTransformFeedbackVaryingEXT_remap_index 467
-#define TransformFeedbackVaryingsEXT_remap_index 468
-#define ProvokingVertexEXT_remap_index 469
-#define GetTexParameterPointervAPPLE_remap_index 470
-#define TextureRangeAPPLE_remap_index 471
-#define GetObjectParameterivAPPLE_remap_index 472
-#define ObjectPurgeableAPPLE_remap_index 473
-#define ObjectUnpurgeableAPPLE_remap_index 474
-#define ActiveProgramEXT_remap_index 475
-#define CreateShaderProgramEXT_remap_index 476
-#define UseShaderProgramEXT_remap_index 477
-#define TextureBarrierNV_remap_index 478
-#define StencilFuncSeparateATI_remap_index 479
-#define ProgramEnvParameters4fvEXT_remap_index 480
-#define ProgramLocalParameters4fvEXT_remap_index 481
-#define GetQueryObjecti64vEXT_remap_index 482
-#define GetQueryObjectui64vEXT_remap_index 483
-#define EGLImageTargetRenderbufferStorageOES_remap_index 484
-#define EGLImageTargetTexture2DOES_remap_index 485
+#define BindSampler_remap_index 192
+#define DeleteSamplers_remap_index 193
+#define GenSamplers_remap_index 194
+#define GetSamplerParameterIiv_remap_index 195
+#define GetSamplerParameterIuiv_remap_index 196
+#define GetSamplerParameterfv_remap_index 197
+#define GetSamplerParameteriv_remap_index 198
+#define IsSampler_remap_index 199
+#define SamplerParameterIiv_remap_index 200
+#define SamplerParameterIuiv_remap_index 201
+#define SamplerParameterf_remap_index 202
+#define SamplerParameterfv_remap_index 203
+#define SamplerParameteri_remap_index 204
+#define SamplerParameteriv_remap_index 205
+#define BindTransformFeedback_remap_index 206
+#define DeleteTransformFeedbacks_remap_index 207
+#define DrawTransformFeedback_remap_index 208
+#define GenTransformFeedbacks_remap_index 209
+#define IsTransformFeedback_remap_index 210
+#define PauseTransformFeedback_remap_index 211
+#define ResumeTransformFeedback_remap_index 212
+#define ClearDepthf_remap_index 213
+#define DepthRangef_remap_index 214
+#define GetShaderPrecisionFormat_remap_index 215
+#define ReleaseShaderCompiler_remap_index 216
+#define ShaderBinary_remap_index 217
+#define PolygonOffsetEXT_remap_index 218
+#define GetPixelTexGenParameterfvSGIS_remap_index 219
+#define GetPixelTexGenParameterivSGIS_remap_index 220
+#define PixelTexGenParameterfSGIS_remap_index 221
+#define PixelTexGenParameterfvSGIS_remap_index 222
+#define PixelTexGenParameteriSGIS_remap_index 223
+#define PixelTexGenParameterivSGIS_remap_index 224
+#define SampleMaskSGIS_remap_index 225
+#define SamplePatternSGIS_remap_index 226
+#define ColorPointerEXT_remap_index 227
+#define EdgeFlagPointerEXT_remap_index 228
+#define IndexPointerEXT_remap_index 229
+#define NormalPointerEXT_remap_index 230
+#define TexCoordPointerEXT_remap_index 231
+#define VertexPointerEXT_remap_index 232
+#define PointParameterfEXT_remap_index 233
+#define PointParameterfvEXT_remap_index 234
+#define LockArraysEXT_remap_index 235
+#define UnlockArraysEXT_remap_index 236
+#define SecondaryColor3bEXT_remap_index 237
+#define SecondaryColor3bvEXT_remap_index 238
+#define SecondaryColor3dEXT_remap_index 239
+#define SecondaryColor3dvEXT_remap_index 240
+#define SecondaryColor3fEXT_remap_index 241
+#define SecondaryColor3fvEXT_remap_index 242
+#define SecondaryColor3iEXT_remap_index 243
+#define SecondaryColor3ivEXT_remap_index 244
+#define SecondaryColor3sEXT_remap_index 245
+#define SecondaryColor3svEXT_remap_index 246
+#define SecondaryColor3ubEXT_remap_index 247
+#define SecondaryColor3ubvEXT_remap_index 248
+#define SecondaryColor3uiEXT_remap_index 249
+#define SecondaryColor3uivEXT_remap_index 250
+#define SecondaryColor3usEXT_remap_index 251
+#define SecondaryColor3usvEXT_remap_index 252
+#define SecondaryColorPointerEXT_remap_index 253
+#define MultiDrawArraysEXT_remap_index 254
+#define MultiDrawElementsEXT_remap_index 255
+#define FogCoordPointerEXT_remap_index 256
+#define FogCoorddEXT_remap_index 257
+#define FogCoorddvEXT_remap_index 258
+#define FogCoordfEXT_remap_index 259
+#define FogCoordfvEXT_remap_index 260
+#define PixelTexGenSGIX_remap_index 261
+#define BlendFuncSeparateEXT_remap_index 262
+#define FlushVertexArrayRangeNV_remap_index 263
+#define VertexArrayRangeNV_remap_index 264
+#define CombinerInputNV_remap_index 265
+#define CombinerOutputNV_remap_index 266
+#define CombinerParameterfNV_remap_index 267
+#define CombinerParameterfvNV_remap_index 268
+#define CombinerParameteriNV_remap_index 269
+#define CombinerParameterivNV_remap_index 270
+#define FinalCombinerInputNV_remap_index 271
+#define GetCombinerInputParameterfvNV_remap_index 272
+#define GetCombinerInputParameterivNV_remap_index 273
+#define GetCombinerOutputParameterfvNV_remap_index 274
+#define GetCombinerOutputParameterivNV_remap_index 275
+#define GetFinalCombinerInputParameterfvNV_remap_index 276
+#define GetFinalCombinerInputParameterivNV_remap_index 277
+#define ResizeBuffersMESA_remap_index 278
+#define WindowPos2dMESA_remap_index 279
+#define WindowPos2dvMESA_remap_index 280
+#define WindowPos2fMESA_remap_index 281
+#define WindowPos2fvMESA_remap_index 282
+#define WindowPos2iMESA_remap_index 283
+#define WindowPos2ivMESA_remap_index 284
+#define WindowPos2sMESA_remap_index 285
+#define WindowPos2svMESA_remap_index 286
+#define WindowPos3dMESA_remap_index 287
+#define WindowPos3dvMESA_remap_index 288
+#define WindowPos3fMESA_remap_index 289
+#define WindowPos3fvMESA_remap_index 290
+#define WindowPos3iMESA_remap_index 291
+#define WindowPos3ivMESA_remap_index 292
+#define WindowPos3sMESA_remap_index 293
+#define WindowPos3svMESA_remap_index 294
+#define WindowPos4dMESA_remap_index 295
+#define WindowPos4dvMESA_remap_index 296
+#define WindowPos4fMESA_remap_index 297
+#define WindowPos4fvMESA_remap_index 298
+#define WindowPos4iMESA_remap_index 299
+#define WindowPos4ivMESA_remap_index 300
+#define WindowPos4sMESA_remap_index 301
+#define WindowPos4svMESA_remap_index 302
+#define MultiModeDrawArraysIBM_remap_index 303
+#define MultiModeDrawElementsIBM_remap_index 304
+#define DeleteFencesNV_remap_index 305
+#define FinishFenceNV_remap_index 306
+#define GenFencesNV_remap_index 307
+#define GetFenceivNV_remap_index 308
+#define IsFenceNV_remap_index 309
+#define SetFenceNV_remap_index 310
+#define TestFenceNV_remap_index 311
+#define AreProgramsResidentNV_remap_index 312
+#define BindProgramNV_remap_index 313
+#define DeleteProgramsNV_remap_index 314
+#define ExecuteProgramNV_remap_index 315
+#define GenProgramsNV_remap_index 316
+#define GetProgramParameterdvNV_remap_index 317
+#define GetProgramParameterfvNV_remap_index 318
+#define GetProgramStringNV_remap_index 319
+#define GetProgramivNV_remap_index 320
+#define GetTrackMatrixivNV_remap_index 321
+#define GetVertexAttribPointervNV_remap_index 322
+#define GetVertexAttribdvNV_remap_index 323
+#define GetVertexAttribfvNV_remap_index 324
+#define GetVertexAttribivNV_remap_index 325
+#define IsProgramNV_remap_index 326
+#define LoadProgramNV_remap_index 327
+#define ProgramParameters4dvNV_remap_index 328
+#define ProgramParameters4fvNV_remap_index 329
+#define RequestResidentProgramsNV_remap_index 330
+#define TrackMatrixNV_remap_index 331
+#define VertexAttrib1dNV_remap_index 332
+#define VertexAttrib1dvNV_remap_index 333
+#define VertexAttrib1fNV_remap_index 334
+#define VertexAttrib1fvNV_remap_index 335
+#define VertexAttrib1sNV_remap_index 336
+#define VertexAttrib1svNV_remap_index 337
+#define VertexAttrib2dNV_remap_index 338
+#define VertexAttrib2dvNV_remap_index 339
+#define VertexAttrib2fNV_remap_index 340
+#define VertexAttrib2fvNV_remap_index 341
+#define VertexAttrib2sNV_remap_index 342
+#define VertexAttrib2svNV_remap_index 343
+#define VertexAttrib3dNV_remap_index 344
+#define VertexAttrib3dvNV_remap_index 345
+#define VertexAttrib3fNV_remap_index 346
+#define VertexAttrib3fvNV_remap_index 347
+#define VertexAttrib3sNV_remap_index 348
+#define VertexAttrib3svNV_remap_index 349
+#define VertexAttrib4dNV_remap_index 350
+#define VertexAttrib4dvNV_remap_index 351
+#define VertexAttrib4fNV_remap_index 352
+#define VertexAttrib4fvNV_remap_index 353
+#define VertexAttrib4sNV_remap_index 354
+#define VertexAttrib4svNV_remap_index 355
+#define VertexAttrib4ubNV_remap_index 356
+#define VertexAttrib4ubvNV_remap_index 357
+#define VertexAttribPointerNV_remap_index 358
+#define VertexAttribs1dvNV_remap_index 359
+#define VertexAttribs1fvNV_remap_index 360
+#define VertexAttribs1svNV_remap_index 361
+#define VertexAttribs2dvNV_remap_index 362
+#define VertexAttribs2fvNV_remap_index 363
+#define VertexAttribs2svNV_remap_index 364
+#define VertexAttribs3dvNV_remap_index 365
+#define VertexAttribs3fvNV_remap_index 366
+#define VertexAttribs3svNV_remap_index 367
+#define VertexAttribs4dvNV_remap_index 368
+#define VertexAttribs4fvNV_remap_index 369
+#define VertexAttribs4svNV_remap_index 370
+#define VertexAttribs4ubvNV_remap_index 371
+#define GetTexBumpParameterfvATI_remap_index 372
+#define GetTexBumpParameterivATI_remap_index 373
+#define TexBumpParameterfvATI_remap_index 374
+#define TexBumpParameterivATI_remap_index 375
+#define AlphaFragmentOp1ATI_remap_index 376
+#define AlphaFragmentOp2ATI_remap_index 377
+#define AlphaFragmentOp3ATI_remap_index 378
+#define BeginFragmentShaderATI_remap_index 379
+#define BindFragmentShaderATI_remap_index 380
+#define ColorFragmentOp1ATI_remap_index 381
+#define ColorFragmentOp2ATI_remap_index 382
+#define ColorFragmentOp3ATI_remap_index 383
+#define DeleteFragmentShaderATI_remap_index 384
+#define EndFragmentShaderATI_remap_index 385
+#define GenFragmentShadersATI_remap_index 386
+#define PassTexCoordATI_remap_index 387
+#define SampleMapATI_remap_index 388
+#define SetFragmentShaderConstantATI_remap_index 389
+#define PointParameteriNV_remap_index 390
+#define PointParameterivNV_remap_index 391
+#define ActiveStencilFaceEXT_remap_index 392
+#define BindVertexArrayAPPLE_remap_index 393
+#define DeleteVertexArraysAPPLE_remap_index 394
+#define GenVertexArraysAPPLE_remap_index 395
+#define IsVertexArrayAPPLE_remap_index 396
+#define GetProgramNamedParameterdvNV_remap_index 397
+#define GetProgramNamedParameterfvNV_remap_index 398
+#define ProgramNamedParameter4dNV_remap_index 399
+#define ProgramNamedParameter4dvNV_remap_index 400
+#define ProgramNamedParameter4fNV_remap_index 401
+#define ProgramNamedParameter4fvNV_remap_index 402
+#define PrimitiveRestartIndexNV_remap_index 403
+#define PrimitiveRestartNV_remap_index 404
+#define DepthBoundsEXT_remap_index 405
+#define BlendEquationSeparateEXT_remap_index 406
+#define BindFramebufferEXT_remap_index 407
+#define BindRenderbufferEXT_remap_index 408
+#define CheckFramebufferStatusEXT_remap_index 409
+#define DeleteFramebuffersEXT_remap_index 410
+#define DeleteRenderbuffersEXT_remap_index 411
+#define FramebufferRenderbufferEXT_remap_index 412
+#define FramebufferTexture1DEXT_remap_index 413
+#define FramebufferTexture2DEXT_remap_index 414
+#define FramebufferTexture3DEXT_remap_index 415
+#define GenFramebuffersEXT_remap_index 416
+#define GenRenderbuffersEXT_remap_index 417
+#define GenerateMipmapEXT_remap_index 418
+#define GetFramebufferAttachmentParameterivEXT_remap_index 419
+#define GetRenderbufferParameterivEXT_remap_index 420
+#define IsFramebufferEXT_remap_index 421
+#define IsRenderbufferEXT_remap_index 422
+#define RenderbufferStorageEXT_remap_index 423
+#define BlitFramebufferEXT_remap_index 424
+#define BufferParameteriAPPLE_remap_index 425
+#define FlushMappedBufferRangeAPPLE_remap_index 426
+#define BindFragDataLocationEXT_remap_index 427
+#define GetFragDataLocationEXT_remap_index 428
+#define GetUniformuivEXT_remap_index 429
+#define GetVertexAttribIivEXT_remap_index 430
+#define GetVertexAttribIuivEXT_remap_index 431
+#define Uniform1uiEXT_remap_index 432
+#define Uniform1uivEXT_remap_index 433
+#define Uniform2uiEXT_remap_index 434
+#define Uniform2uivEXT_remap_index 435
+#define Uniform3uiEXT_remap_index 436
+#define Uniform3uivEXT_remap_index 437
+#define Uniform4uiEXT_remap_index 438
+#define Uniform4uivEXT_remap_index 439
+#define VertexAttribI1iEXT_remap_index 440
+#define VertexAttribI1ivEXT_remap_index 441
+#define VertexAttribI1uiEXT_remap_index 442
+#define VertexAttribI1uivEXT_remap_index 443
+#define VertexAttribI2iEXT_remap_index 444
+#define VertexAttribI2ivEXT_remap_index 445
+#define VertexAttribI2uiEXT_remap_index 446
+#define VertexAttribI2uivEXT_remap_index 447
+#define VertexAttribI3iEXT_remap_index 448
+#define VertexAttribI3ivEXT_remap_index 449
+#define VertexAttribI3uiEXT_remap_index 450
+#define VertexAttribI3uivEXT_remap_index 451
+#define VertexAttribI4bvEXT_remap_index 452
+#define VertexAttribI4iEXT_remap_index 453
+#define VertexAttribI4ivEXT_remap_index 454
+#define VertexAttribI4svEXT_remap_index 455
+#define VertexAttribI4ubvEXT_remap_index 456
+#define VertexAttribI4uiEXT_remap_index 457
+#define VertexAttribI4uivEXT_remap_index 458
+#define VertexAttribI4usvEXT_remap_index 459
+#define VertexAttribIPointerEXT_remap_index 460
+#define FramebufferTextureLayerEXT_remap_index 461
+#define ColorMaskIndexedEXT_remap_index 462
+#define DisableIndexedEXT_remap_index 463
+#define EnableIndexedEXT_remap_index 464
+#define GetBooleanIndexedvEXT_remap_index 465
+#define GetIntegerIndexedvEXT_remap_index 466
+#define IsEnabledIndexedEXT_remap_index 467
+#define ClearColorIiEXT_remap_index 468
+#define ClearColorIuiEXT_remap_index 469
+#define GetTexParameterIivEXT_remap_index 470
+#define GetTexParameterIuivEXT_remap_index 471
+#define TexParameterIivEXT_remap_index 472
+#define TexParameterIuivEXT_remap_index 473
+#define BeginConditionalRenderNV_remap_index 474
+#define EndConditionalRenderNV_remap_index 475
+#define BeginTransformFeedbackEXT_remap_index 476
+#define BindBufferBaseEXT_remap_index 477
+#define BindBufferOffsetEXT_remap_index 478
+#define BindBufferRangeEXT_remap_index 479
+#define EndTransformFeedbackEXT_remap_index 480
+#define GetTransformFeedbackVaryingEXT_remap_index 481
+#define TransformFeedbackVaryingsEXT_remap_index 482
+#define ProvokingVertexEXT_remap_index 483
+#define GetTexParameterPointervAPPLE_remap_index 484
+#define TextureRangeAPPLE_remap_index 485
+#define GetObjectParameterivAPPLE_remap_index 486
+#define ObjectPurgeableAPPLE_remap_index 487
+#define ObjectUnpurgeableAPPLE_remap_index 488
+#define ActiveProgramEXT_remap_index 489
+#define CreateShaderProgramEXT_remap_index 490
+#define UseShaderProgramEXT_remap_index 491
+#define TextureBarrierNV_remap_index 492
+#define StencilFuncSeparateATI_remap_index 493
+#define ProgramEnvParameters4fvEXT_remap_index 494
+#define ProgramLocalParameters4fvEXT_remap_index 495
+#define GetQueryObjecti64vEXT_remap_index 496
+#define GetQueryObjectui64vEXT_remap_index 497
+#define EGLImageTargetRenderbufferStorageOES_remap_index 498
+#define EGLImageTargetTexture2DOES_remap_index 499
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1643,6 +1671,20 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index]
 #define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index]
 #define _gloffset_BlendFunciARB driDispatchRemapTable[BlendFunciARB_remap_index]
+#define _gloffset_BindSampler driDispatchRemapTable[BindSampler_remap_index]
+#define _gloffset_DeleteSamplers driDispatchRemapTable[DeleteSamplers_remap_index]
+#define _gloffset_GenSamplers driDispatchRemapTable[GenSamplers_remap_index]
+#define _gloffset_GetSamplerParameterIiv driDispatchRemapTable[GetSamplerParameterIiv_remap_index]
+#define _gloffset_GetSamplerParameterIuiv driDispatchRemapTable[GetSamplerParameterIuiv_remap_index]
+#define _gloffset_GetSamplerParameterfv driDispatchRemapTable[GetSamplerParameterfv_remap_index]
+#define _gloffset_GetSamplerParameteriv driDispatchRemapTable[GetSamplerParameteriv_remap_index]
+#define _gloffset_IsSampler driDispatchRemapTable[IsSampler_remap_index]
+#define _gloffset_SamplerParameterIiv driDispatchRemapTable[SamplerParameterIiv_remap_index]
+#define _gloffset_SamplerParameterIuiv driDispatchRemapTable[SamplerParameterIuiv_remap_index]
+#define _gloffset_SamplerParameterf driDispatchRemapTable[SamplerParameterf_remap_index]
+#define _gloffset_SamplerParameterfv driDispatchRemapTable[SamplerParameterfv_remap_index]
+#define _gloffset_SamplerParameteri driDispatchRemapTable[SamplerParameteri_remap_index]
+#define _gloffset_SamplerParameteriv driDispatchRemapTable[SamplerParameteriv_remap_index]
 #define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index]
 #define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index]
 #define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index]
@@ -3740,6 +3782,48 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_BlendFunciARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLenum)), _gloffset_BlendFunciARB, parameters)
 #define GET_BlendFunciARB(disp) GET_by_offset(disp, _gloffset_BlendFunciARB)
 #define SET_BlendFunciARB(disp, fn) SET_by_offset(disp, _gloffset_BlendFunciARB, fn)
+#define CALL_BindSampler(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), _gloffset_BindSampler, parameters)
+#define GET_BindSampler(disp) GET_by_offset(disp, _gloffset_BindSampler)
+#define SET_BindSampler(disp, fn) SET_by_offset(disp, _gloffset_BindSampler, fn)
+#define CALL_DeleteSamplers(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteSamplers, parameters)
+#define GET_DeleteSamplers(disp) GET_by_offset(disp, _gloffset_DeleteSamplers)
+#define SET_DeleteSamplers(disp, fn) SET_by_offset(disp, _gloffset_DeleteSamplers, fn)
+#define CALL_GenSamplers(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenSamplers, parameters)
+#define GET_GenSamplers(disp) GET_by_offset(disp, _gloffset_GenSamplers)
+#define SET_GenSamplers(disp, fn) SET_by_offset(disp, _gloffset_GenSamplers, fn)
+#define CALL_GetSamplerParameterIiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetSamplerParameterIiv, parameters)
+#define GET_GetSamplerParameterIiv(disp) GET_by_offset(disp, _gloffset_GetSamplerParameterIiv)
+#define SET_GetSamplerParameterIiv(disp, fn) SET_by_offset(disp, _gloffset_GetSamplerParameterIiv, fn)
+#define CALL_GetSamplerParameterIuiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint *)), _gloffset_GetSamplerParameterIuiv, parameters)
+#define GET_GetSamplerParameterIuiv(disp) GET_by_offset(disp, _gloffset_GetSamplerParameterIuiv)
+#define SET_GetSamplerParameterIuiv(disp, fn) SET_by_offset(disp, _gloffset_GetSamplerParameterIuiv, fn)
+#define CALL_GetSamplerParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLfloat *)), _gloffset_GetSamplerParameterfv, parameters)
+#define GET_GetSamplerParameterfv(disp) GET_by_offset(disp, _gloffset_GetSamplerParameterfv)
+#define SET_GetSamplerParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetSamplerParameterfv, fn)
+#define CALL_GetSamplerParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetSamplerParameteriv, parameters)
+#define GET_GetSamplerParameteriv(disp) GET_by_offset(disp, _gloffset_GetSamplerParameteriv)
+#define SET_GetSamplerParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetSamplerParameteriv, fn)
+#define CALL_IsSampler(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsSampler, parameters)
+#define GET_IsSampler(disp) GET_by_offset(disp, _gloffset_IsSampler)
+#define SET_IsSampler(disp, fn) SET_by_offset(disp, _gloffset_IsSampler, fn)
+#define CALL_SamplerParameterIiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, const GLint *)), _gloffset_SamplerParameterIiv, parameters)
+#define GET_SamplerParameterIiv(disp) GET_by_offset(disp, _gloffset_SamplerParameterIiv)
+#define SET_SamplerParameterIiv(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameterIiv, fn)
+#define CALL_SamplerParameterIuiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, const GLuint *)), _gloffset_SamplerParameterIuiv, parameters)
+#define GET_SamplerParameterIuiv(disp) GET_by_offset(disp, _gloffset_SamplerParameterIuiv)
+#define SET_SamplerParameterIuiv(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameterIuiv, fn)
+#define CALL_SamplerParameterf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLfloat)), _gloffset_SamplerParameterf, parameters)
+#define GET_SamplerParameterf(disp) GET_by_offset(disp, _gloffset_SamplerParameterf)
+#define SET_SamplerParameterf(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameterf, fn)
+#define CALL_SamplerParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, const GLfloat *)), _gloffset_SamplerParameterfv, parameters)
+#define GET_SamplerParameterfv(disp) GET_by_offset(disp, _gloffset_SamplerParameterfv)
+#define SET_SamplerParameterfv(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameterfv, fn)
+#define CALL_SamplerParameteri(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint)), _gloffset_SamplerParameteri, parameters)
+#define GET_SamplerParameteri(disp) GET_by_offset(disp, _gloffset_SamplerParameteri)
+#define SET_SamplerParameteri(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameteri, fn)
+#define CALL_SamplerParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, const GLint *)), _gloffset_SamplerParameteriv, parameters)
+#define GET_SamplerParameteriv(disp) GET_by_offset(disp, _gloffset_SamplerParameteriv)
+#define SET_SamplerParameteriv(disp, fn) SET_by_offset(disp, _gloffset_SamplerParameteriv, fn)
 #define CALL_BindTransformFeedback(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindTransformFeedback, parameters)
 #define GET_BindTransformFeedback(disp) GET_by_offset(disp, _gloffset_BindTransformFeedback)
 #define SET_BindTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_BindTransformFeedback, fn)
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 1b39f5fdd36..33db5081419 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -122,6 +122,7 @@
 #define FEATURE_ARB_framebuffer_object    (FEATURE_GL && FEATURE_EXT_framebuffer_object)
 #define FEATURE_ARB_map_buffer_range      FEATURE_GL
 #define FEATURE_ARB_pixel_buffer_object   (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
+#define FEATURE_ARB_sampler_objects       FEATURE_GL
 #define FEATURE_ARB_sync                  FEATURE_GL
 #define FEATURE_ARB_vertex_buffer_object  1
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 13e4325ee45..9e2905ab2b1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1305,37 +1305,58 @@ typedef enum
 
 
 /**
- * Texture object state.  Contains the array of mipmap images, border color,
- * wrap modes, filter modes, shadow/texcompare state, and the per-texture
- * color palette.
+ * Sampler object state.  These objects are new with GL_ARB_sampler_objects
+ * and OpenGL 3.3.  Legacy texture objects also contain a sampler object.
  */
-struct gl_texture_object
+struct gl_sampler_object
 {
-   _glthread_Mutex Mutex;	/**< for thread safety */
-   GLint RefCount;		/**< reference count */
-   GLuint Name;			/**< the user-visible texture object ID */
-   GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
-   GLfloat Priority;		/**< in [0,1] */
-   union {
-      GLfloat f[4];
-      GLuint ui[4];
-      GLint i[4];
-   } BorderColor;               /**< Interpreted according to texture format */
+   GLuint Name;
+   GLint RefCount;
+
    GLenum WrapS;		/**< S-axis texture image wrap mode */
    GLenum WrapT;		/**< T-axis texture image wrap mode */
    GLenum WrapR;		/**< R-axis texture image wrap mode */
    GLenum MinFilter;		/**< minification filter */
    GLenum MagFilter;		/**< magnification filter */
+   union {
+      GLfloat f[4];
+      GLuint ui[4];
+      GLint i[4];
+   } BorderColor;               /**< Interpreted according to texture format */
    GLfloat MinLod;		/**< min lambda, OpenGL 1.2 */
    GLfloat MaxLod;		/**< max lambda, OpenGL 1.2 */
    GLfloat LodBias;		/**< OpenGL 1.4 */
-   GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */
-   GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */
    GLfloat MaxAnisotropy;	/**< GL_EXT_texture_filter_anisotropic */
    GLenum CompareMode;		/**< GL_ARB_shadow */
    GLenum CompareFunc;		/**< GL_ARB_shadow */
    GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */
+   GLenum sRGBDecode;           /**< GL_DECODE_EXT or GL_SKIP_DECODE_EXT */
+
+   /* deprecated sampler state */
    GLenum DepthMode;		/**< GL_ARB_depth_texture */
+
+   /** Is the texture object complete with respect to this sampler? */
+   GLboolean _CompleteTexture;
+};
+
+
+/**
+ * Texture object state.  Contains the array of mipmap images, border color,
+ * wrap modes, filter modes, shadow/texcompare state, and the per-texture
+ * color palette.
+ */
+struct gl_texture_object
+{
+   _glthread_Mutex Mutex;	/**< for thread safety */
+   GLint RefCount;		/**< reference count */
+   GLuint Name;			/**< the user-visible texture object ID */
+   GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
+
+   struct gl_sampler_object Sampler;
+
+   GLfloat Priority;		/**< in [0,1] */
+   GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */
+   GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */
    GLint _MaxLevel;		/**< actual max mipmap level (q in the spec) */
    GLfloat _MaxLambda;		/**< = _MaxLevel - BaseLevel (q - b in spec) */
    GLint CropRect[4];           /**< GL_OES_draw_texture */
@@ -1345,7 +1366,6 @@ struct gl_texture_object
    GLboolean _Complete;		/**< Is texture object complete? */
    GLboolean _RenderToTexture;  /**< Any rendering to this texture? */
    GLboolean Purgeable;         /**< Is the buffer purgeable under memory pressure? */
-   GLenum sRGBDecode;           /**< GL_DECODE_EXT or GL_SKIP_DECODE_EXT */
 
    /** Actual texture images, indexed by [cube face] and [mipmap level] */
    struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];
@@ -1429,6 +1449,9 @@ struct gl_texture_unit
    GLenum BumpTarget;
    GLfloat RotMatrix[4]; /* 2x2 matrix */
 
+   /** Current sampler object (GL_ARB_sampler_objects) */
+   struct gl_sampler_object *Sampler;
+
    /** 
     * \name GL_EXT_texture_env_combine 
     */
@@ -2363,6 +2386,9 @@ struct gl_shared_state
    /* GL_ARB_sync */
    struct simple_node SyncObjects;
 
+   /** GL_ARB_sampler_objects */
+   struct _mesa_HashTable *SamplerObjects;
+
    void *DriverData;  /**< Device driver shared state */
 };
 
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 598e805d05d..72a2f1e0b81 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -594,4194 +594,4250 @@ static const char _mesa_function_pool[] =
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4122]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4122]: DeleteSamplers (will be remapped) */
+   "ip\0"
+   "glDeleteSamplers\0"
+   "\0"
+   /* _mesa_function_pool[4143]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4163]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4184]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4178]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4199]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4195]: GetVertexAttribIuivEXT (will be remapped) */
+   /* _mesa_function_pool[4216]: GetVertexAttribIuivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[4247]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4268]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4292]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4313]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4309]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4330]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4345]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4366]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4379]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4400]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4417]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4438]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4453]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4474]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4467]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[4488]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[4493]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4514]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4519]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4540]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4540]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4561]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4566]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4587]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4596]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4617]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4652]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4673]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4683]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4704]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4713]: PointSize (offset 173) */
+   /* _mesa_function_pool[4734]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4728]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4749]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[4775]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4796]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4806]: PopName (offset 200) */
+   /* _mesa_function_pool[4827]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4818]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4839]: GetSamplerParameterfv (will be remapped) */
+   "iip\0"
+   "glGetSamplerParameterfv\0"
+   "\0"
+   /* _mesa_function_pool[4868]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4845]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4895]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4869]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4919]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4895]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4945]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4940]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4990]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4988]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5038]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5003]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5053]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5030]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5080]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5047]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5097]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5072]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5122]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5091]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5141]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5119]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5169]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5172]: Indexub (offset 315) */
+   /* _mesa_function_pool[5222]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5185]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5235]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5200]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5250]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5219]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5269]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5247]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5297]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5273]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5323]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5319]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5369]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5345]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5395]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5370]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5420]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5396]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5446]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5419]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5469]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5466]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5516]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5485]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5535]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5514]: Scaled (offset 301) */
+   /* _mesa_function_pool[5564]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5528]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5578]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5556]: Scalef (offset 302) */
+   /* _mesa_function_pool[5606]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5570]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5620]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5608]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5658]: ProgramEnvParameters4fvEXT (will be remapped) */
+   "iiip\0"
+   "glProgramEnvParameters4fvEXT\0"
+   "\0"
+   /* _mesa_function_pool[5693]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5660]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[5745]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[5702]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5787]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5732]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5817]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5748]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5833]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5803]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5888]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5817]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5902]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5834]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5919]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5892]: Rotated (offset 299) */
+   /* _mesa_function_pool[5977]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5908]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[5993]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5960]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6045]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5984]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6069]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6006]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6091]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6021]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6106]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6050]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6135]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6074]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6159]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6088]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6173]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6109]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6194]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6130]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6215]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6155]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6240]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6200]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6285]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6244]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6329]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6264]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6349]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6324]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6409]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6369]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6454]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6396]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6481]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6429]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6514]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6457]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6542]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6542]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6627]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6567]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6652]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6585]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6670]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6610]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6695]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6637]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6722]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6679]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[6764]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[6719]: GenLists (offset 5) */
+   /* _mesa_function_pool[6804]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[6733]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[6818]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[6751]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[6836]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[6785]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[6870]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6812]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6897]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6840]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6925]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6875]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6960]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6903]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6988]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6923]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7008]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6943]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7028]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6963]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7048]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6989]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7074]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7017]: Scissor (offset 176) */
+   /* _mesa_function_pool[7102]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7033]: Fogf (offset 153) */
+   /* _mesa_function_pool[7118]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7044]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7129]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7089]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7174]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7133]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7218]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7174]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7259]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7190]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7275]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7205]: Fogi (offset 155) */
+   /* _mesa_function_pool[7290]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7216]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7301]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7233]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7318]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7251]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7336]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7280]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7365]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[7297]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7382]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[7315]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7400]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[7332]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7417]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[7351]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7436]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[7366]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7451]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[7386]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7471]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7403]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7488]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7452]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7537]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7469]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7554]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7488]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7573]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7507]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7592]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7538]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7623]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7590]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7675]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7607]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7692]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[7656]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[7741]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[7712]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7797]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7743]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[7828]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[7797]: Color4us (offset 39) */
+   /* _mesa_function_pool[7882]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7814]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7899]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7904]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7989]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7918]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8003]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7973]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8058]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8019]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8104]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8049]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8134]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8086]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8171]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8115]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
-   "ffffffff\0"
-   "glTexCoord2fNormal3fVertex3fSUN\0"
+   /* _mesa_function_pool[8200]: BindSampler (will be remapped) */
+   "ii\0"
+   "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[8157]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8218]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8210]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8271]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8225]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8286]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8247]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8308]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8277]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8338]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[8324]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8385]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[8368]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8429]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8421]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8482]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8441]: Accum (offset 213) */
+   /* _mesa_function_pool[8502]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8453]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8514]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8474]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8535]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8506]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8567]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8562]: Finish (offset 216) */
+   /* _mesa_function_pool[8623]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8573]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8634]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8597]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8658]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8615]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8676]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[8658]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[8719]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[8694]: HintPGI (dynamic) */
+   /* _mesa_function_pool[8755]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[8708]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[8769]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8766]: Color4s (offset 33) */
+   /* _mesa_function_pool[8827]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[8782]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[8843]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[8807]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[8868]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[8825]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[8886]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8842]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8903]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8857]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[8918]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8882]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8943]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8919]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8980]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8948]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9009]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9005]: Color4i (offset 31) */
+   /* _mesa_function_pool[9066]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9021]: Color4f (offset 29) */
+   /* _mesa_function_pool[9082]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9037]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9098]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9055]: Color4d (offset 27) */
+   /* _mesa_function_pool[9116]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9071]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9132]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9087]: Color4b (offset 25) */
+   /* _mesa_function_pool[9148]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9103]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9164]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9120]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9181]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9150]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9211]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9168]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9229]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9226]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9287]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9247]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9308]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9266]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9327]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[9293]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9354]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[9349]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9410]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[9371]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9432]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[9387]: EndList (offset 1) */
+   /* _mesa_function_pool[9448]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[9399]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9460]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9423]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9484]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9453]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9514]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9487]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9548]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9505]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9566]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9556]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9617]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9575]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9636]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9590]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9651]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9618]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9679]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[9646]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[9707]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[9702]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[9763]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[9730]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[9791]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[9748]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[9809]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[9796]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[9857]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "\0"
-   /* _mesa_function_pool[9817]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9878]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9856]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[9917]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[9906]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[9967]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9924]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9985]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9976]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10037]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[10002]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[10063]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10036]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10097]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10064]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10125]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10110]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10171]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10136]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10197]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10159]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10220]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10174]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10235]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10201]: Color3us (offset 23) */
+   /* _mesa_function_pool[10262]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[10217]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10278]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[10252]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10313]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[10295]: End (offset 43) */
+   /* _mesa_function_pool[10356]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[10303]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10364]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[10328]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10389]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[10354]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10415]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[10384]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10445]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10429]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10490]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[10475]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10536]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[10491]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10552]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10523]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10584]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10548]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10609]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10583]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10644]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10606]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10667]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[10646]: Color3ui (offset 21) */
+   /* _mesa_function_pool[10707]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[10662]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[10723]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[10679]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[10740]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10725]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[10786]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10752]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[10813]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10788]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[10849]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[10804]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[10865]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[10876]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[10937]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[10919]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[10980]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[10941]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[11002]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[10986]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[11047]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11032]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11093]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11065]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11126]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11089]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11150]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11114]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11175]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11167]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11228]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[11224]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11285]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[11262]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11323]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[11287]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11348]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11330]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11391]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[11377]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11438]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11441]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11502]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[11485]: GetError (offset 261) */
+   /* _mesa_function_pool[11546]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[11498]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11559]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[11517]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11578]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[11534]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11595]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11547]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11608]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11603]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11664]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[11619]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[11680]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11653]: PushName (offset 201) */
+   /* _mesa_function_pool[11714]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[11667]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[11728]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[11712]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11773]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11737]: Normal3i (offset 58) */
+   /* _mesa_function_pool[11798]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[11753]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[11814]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[11788]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[11849]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11845]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[11906]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[11888]: ColorPointerListIBM (dynamic) */
-   "iiipi\0"
-   "glColorPointerListIBM\0"
+   /* _mesa_function_pool[11949]: PixelTexGenSGIX (will be remapped) */
+   "i\0"
+   "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[11917]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[11970]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[11967]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[12020]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[12001]: Normal3b (offset 52) */
+   /* _mesa_function_pool[12054]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12017]: Normal3d (offset 54) */
+   /* _mesa_function_pool[12070]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12033]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12086]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12066]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12119]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12082]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12135]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12127]: Indexi (offset 48) */
+   /* _mesa_function_pool[12180]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12139]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12192]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12172]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12225]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[12200]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12253]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[12221]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12274]: ColorPointerListIBM (dynamic) */
+   "iiipi\0"
+   "glColorPointerListIBM\0"
+   "\0"
+   /* _mesa_function_pool[12303]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12267]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12349]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[12282]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12364]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[12296]: Indexf (offset 46) */
+   /* _mesa_function_pool[12378]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[12308]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12390]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[12346]: Indexd (offset 44) */
+   /* _mesa_function_pool[12428]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[12358]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12440]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[12379]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12461]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[12396]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12478]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[12418]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[12500]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[12454]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12536]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[12499]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12581]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[12515]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12597]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12561]: Indexs (offset 50) */
+   /* _mesa_function_pool[12643]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12573]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12655]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[12593]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12675]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[12615]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[12697]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "\0"
-   /* _mesa_function_pool[12646]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[12728]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[12684]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[12766]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[12716]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[12798]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[12743]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[12825]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[12758]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[12840]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[12775]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[12857]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[12822]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[12904]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[12837]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12919]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12890]: Color4bv (offset 26) */
+   /* _mesa_function_pool[12972]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[12904]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[12986]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[12926]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13008]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[12974]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[13056]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[12999]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[13081]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13047]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[13129]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13071]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13153]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13106]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13188]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13124]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13206]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13137]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13219]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[13161]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13243]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[13176]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13258]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[13252]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13334]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[13269]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13351]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[13289]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13371]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[13316]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13398]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[13361]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13443]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[13376]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13458]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13408]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13490]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[13453]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13535]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[13481]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13563]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[13505]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13587]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13566]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[13648]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[13588]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[13670]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[13612]: GenTextures (offset 328) */
+   /* _mesa_function_pool[13694]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[13647]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[13729]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[13677]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[13759]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[13694]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[13776]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[13750]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[13832]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13789]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[13871]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[13821]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[13903]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[13854]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[13936]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[13876]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13958]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13904]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[13986]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[13922]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[14004]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[13961]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14043]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[13979]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[14061]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[13994]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[14076]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[14010]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[14092]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[14027]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[14109]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14051]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14133]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14068]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14150]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14123]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14205]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[14138]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14220]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14157]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14239]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[14186]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14268]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[14229]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14311]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14273]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14355]: IsSampler (will be remapped) */
+   "i\0"
+   "glIsSampler\0"
+   "\0"
+   /* _mesa_function_pool[14370]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[14289]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14386]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[14340]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14437]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14374]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14471]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14403]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14500]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[14448]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14545]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14504]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14601]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14525]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[14622]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[14558]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14655]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[14588]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[14685]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[14623]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[14720]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[14642]: Flush (offset 217) */
+   /* _mesa_function_pool[14739]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[14652]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14749]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[14667]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[14764]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[14713]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[14810]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[14735]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[14832]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[14771]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[14868]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[14789]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[14886]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14832]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[14929]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[14856]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14953]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14872]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14969]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14890]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[14987]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[14932]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[15029]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14954]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[15051]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[14974]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15071]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15015]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[15112]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[15070]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15167]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15088]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15185]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[15112]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15209]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15130]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15227]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15148]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15245]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[15202]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15299]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[15244]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15341]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15261]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15358]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[15281]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15378]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[15310]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15407]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15328]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15425]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15388]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15485]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[15407]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15504]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[15420]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15517]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[15438]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15535]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[15482]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15579]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[15542]: Frustum (offset 289) */
+   /* _mesa_function_pool[15639]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[15560]: GetString (offset 275) */
+   /* _mesa_function_pool[15657]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[15575]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15672]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15601]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[15698]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[15616]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[15713]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[15634]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[15731]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[15664]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[15761]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[15682]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[15779]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15727]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[15824]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[15771]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[15868]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[15814]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[15911]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[15855]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15952]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15883]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15980]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15918]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[16015]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[15936]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[16033]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15967]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16064]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16001]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[16098]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[16026]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[16123]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[16082]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[16179]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[16101]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16198]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[16117]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16214]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[16165]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16262]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[16211]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16308]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[16228]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16325]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[16276]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[16373]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16309]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16406]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[16336]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16433]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16363]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16460]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16400]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16497]: SamplerParameterIiv (will be remapped) */
+   "iip\0"
+   "glSamplerParameterIiv\0"
+   "\0"
+   /* _mesa_function_pool[16524]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[16420]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16544]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[16441]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16565]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16468]: Rectd (offset 86) */
+   /* _mesa_function_pool[16592]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[16482]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16606]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16508]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[16632]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[16529]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[16653]: SamplerParameterfv (will be remapped) */
+   "iip\0"
+   "glSamplerParameterfv\0"
+   "\0"
+   /* _mesa_function_pool[16679]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[16576]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[16726]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[16623]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[16773]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[16642]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[16792]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "\0"
-   /* _mesa_function_pool[16675]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[16825]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[16720]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16870]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16745]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16895]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16775]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[16925]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[16822]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[16972]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[16870]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[17020]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[16928]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[17078]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16962]: Lightfv (offset 160) */
+   /* _mesa_function_pool[17112]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[16977]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[17127]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[17030]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[17180]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[17046]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[17196]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[17066]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[17216]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[17088]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[17238]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17131]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17281]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[17145]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17295]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17190]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[17340]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17227]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17377]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[17248]: Rects (offset 92) */
+   /* _mesa_function_pool[17398]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[17262]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17412]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17296]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17446]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17325]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17475]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17347]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17497]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[17362]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17512]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[17406]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17556]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[17454]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[17604]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17479]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[17629]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[17503]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[17653]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[17548]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[17698]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[17569]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[17719]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[17612]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17762]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17638]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[17788]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[17664]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[17814]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[17682]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[17832]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[17725]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[17875]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[17779]: Rectdv (offset 87) */
+   /* _mesa_function_pool[17929]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[17792]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[17942]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[17818]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[17968]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "\0"
-   /* _mesa_function_pool[17842]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17992]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17901]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18051]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17929]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[18079]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[17974]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[18124]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[18052]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[18202]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[18079]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[18229]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18106]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18256]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[18128]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18278]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[18146]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18296]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[18168]: ProgramEnvParameters4fvEXT (will be remapped) */
-   "iiip\0"
-   "glProgramEnvParameters4fvEXT\0"
+   /* _mesa_function_pool[18318]: SamplerParameteriv (will be remapped) */
+   "iip\0"
+   "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18203]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18344]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18249]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18390]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[18302]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18443]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18339]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18480]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18385]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18526]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[18403]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18544]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18467]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[18608]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[18510]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[18651]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   "ffffffff\0"
+   "glTexCoord2fNormal3fVertex3fSUN\0"
+   "\0"
+   /* _mesa_function_pool[18693]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[18537]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[18720]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[18564]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18747]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[18620]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[18803]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[18648]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[18831]: Tangent3ivEXT (dynamic) */
+   "p\0"
+   "glTangent3ivEXT\0"
+   "\0"
+   /* _mesa_function_pool[18850]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[18686]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[18888]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[18704]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[18906]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[18728]: TexGeni (offset 192) */
+   /* _mesa_function_pool[18930]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[18743]: TexGenf (offset 190) */
+   /* _mesa_function_pool[18945]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[18758]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[18960]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[18791]: TexGend (offset 188) */
+   /* _mesa_function_pool[18993]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[18806]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[19008]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[18833]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[19035]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[18856]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[19058]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[18875]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[19077]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[18903]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[19105]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[18957]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[19159]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[18981]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[19183]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[19016]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[19218]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[19058]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19260]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19087]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[19289]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[19111]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[19313]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[19158]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[19360]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[19208]: PixelTexGenSGIX (will be remapped) */
-   "i\0"
-   "glPixelTexGenSGIX\0"
+   /* _mesa_function_pool[19410]: GetSamplerParameterIuiv (will be remapped) */
+   "iip\0"
+   "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[19229]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19441]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[19256]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[19468]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[19290]: Color4sv (offset 34) */
+   /* _mesa_function_pool[19502]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[19304]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[19516]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[19334]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[19546]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19366]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[19578]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19401]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[19613]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[19417]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[19629]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[19450]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[19662]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[19508]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[19720]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[19564]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[19776]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[19594]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[19806]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[19614]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[19826]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[19633]: Color3dv (offset 12) */
+   /* _mesa_function_pool[19845]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[19647]: IsTexture (offset 330) */
+   /* _mesa_function_pool[19859]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[19677]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[19889]: GenSamplers (will be remapped) */
+   "ip\0"
+   "glGenSamplers\0"
+   "\0"
+   /* _mesa_function_pool[19907]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[19700]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[19930]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[19741]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[19971]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[19776]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[20006]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[19795]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[20025]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[19834]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[20064]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[19864]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[20094]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[19896]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[20126]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[19925]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[20155]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[19941]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[20171]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19969]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[20199]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[19986]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[20216]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[20028]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[20258]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[20046]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[20276]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[20072]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20302]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20121]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[20351]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[20139]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[20369]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[20184]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20414]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[20218]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20448]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[20242]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[20472]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[20281]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[20511]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[20310]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[20540]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[20328]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[20558]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[20371]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[20601]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[20391]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[20621]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[20459]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[20689]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[20514]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[20744]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[20552]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[20782]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[20586]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[20816]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[20634]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[20864]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[20662]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[20892]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[20715]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[20945]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[20736]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[20966]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[20763]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[20993]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[20795]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[21025]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[20819]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[21049]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[20884]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[21114]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[20906]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[21136]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[20924]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[21154]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[20947]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[21177]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[20974]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[21204]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[21024]: Color3s (offset 17) */
+   /* _mesa_function_pool[21254]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[21039]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[21269]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[21073]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[21303]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[21126]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[21356]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[21145]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[21375]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[21169]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21399]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21213]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[21443]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[21236]: Color3i (offset 15) */
+   /* _mesa_function_pool[21466]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[21251]: FrontFace (offset 157) */
+   /* _mesa_function_pool[21481]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[21266]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[21496]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[21284]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[21514]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[21332]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[21562]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[21350]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[21580]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21393]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[21623]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[21443]: Color3b (offset 9) */
+   /* _mesa_function_pool[21673]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[21458]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[21688]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[21502]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[21732]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[21526]: Color3f (offset 13) */
+   /* _mesa_function_pool[21756]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[21541]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[21771]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[21561]: Color3d (offset 11) */
+   /* _mesa_function_pool[21791]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[21576]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[21806]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[21591]: Lightf (offset 159) */
+   /* _mesa_function_pool[21821]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[21605]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[21835]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[21631]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[21861]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[21647]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[21877]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[21668]: Lighti (offset 161) */
+   /* _mesa_function_pool[21898]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[21682]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[21912]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[21713]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[21943]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[21730]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[21960]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[21775]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[22005]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21860]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[22090]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[21895]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[22125]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21940]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[22170]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[21975]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[22205]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[21992]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[22222]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[22009]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[22239]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[22026]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[22256]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[22071]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22301]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22114]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[22344]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[22145]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[22375]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[22200]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[22430]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[22225]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22455]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[22251]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[22481]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22296]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[22526]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[22330]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[22560]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[22357]: TrackMatrixNV (will be remapped) */
-   "iiii\0"
-   "glTrackMatrixNV\0"
+   /* _mesa_function_pool[22587]: SamplerParameteri (will be remapped) */
+   "iii\0"
+   "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[22379]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[22612]: SamplerParameterf (will be remapped) */
+   "iif\0"
+   "glSamplerParameterf\0"
+   "\0"
+   /* _mesa_function_pool[22637]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[22406]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[22664]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[22435]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22693]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22461]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[22719]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[22484]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[22742]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[22503]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22761]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[22530]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[22788]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[22548]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[22806]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[22593]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[22851]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[22636]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22894]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[22655]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[22913]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[22674]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[22932]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[22698]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[22956]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[22747]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[23005]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[22774]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23032]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[22813]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[23071]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[22829]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[23087]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[22877]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[23135]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[22897]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[23155]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[22945]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[23203]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[22969]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23227]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23010]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[23268]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[23042]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[23300]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[23060]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[23318]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23152]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[23410]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23183]: Bitmap (offset 8) */
+   /* _mesa_function_pool[23441]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[23201]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[23459]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[23246]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[23504]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[23277]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[23535]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[23313]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23571]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23356]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[23614]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[23382]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[23640]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[23414]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[23672]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[23429]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[23687]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[23447]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[23705]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[23487]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[23745]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23514]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[23772]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[23543]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[23801]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[23562]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[23820]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[23610]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[23868]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[23645]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[23903]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[23672]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[23930]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[23696]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[23954]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23730]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[23988]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[23782]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[24040]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[23801]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[24059]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[23832]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[24090]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[23870]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[24128]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[23913]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[24171]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[23958]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[24216]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[23978]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24236]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24049]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[24307]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[24071]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[24329]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[24091]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[24349]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[24145]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[24403]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24198]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[24456]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[24226]: Map1d (offset 220) */
+   /* _mesa_function_pool[24484]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[24242]: Map1f (offset 221) */
+   /* _mesa_function_pool[24500]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[24258]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[24516]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[24317]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[24575]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[24353]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[24611]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[24377]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[24635]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[24398]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[24656]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[24429]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[24687]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[24468]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[24726]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[24490]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[24748]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[24541]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[24799]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24595]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[24853]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[24616]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[24874]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[24662]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[24920]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[24677]: Fogiv (offset 156) */
+   /* _mesa_function_pool[24935]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[24689]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[24947]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[24706]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[24964]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[24742]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[25000]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[24763]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[25021]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[24790]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[25048]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[24814]: Rotatef (offset 300) */
+   /* _mesa_function_pool[25072]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[24830]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[25088]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24872]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[25130]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[24888]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[25146]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[24904]: Clear (offset 203) */
+   /* _mesa_function_pool[25162]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[24915]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[25173]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[24931]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[25189]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24958]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[25216]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[24992]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[25250]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[25008]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[25266]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[25064]: Ortho (offset 296) */
+   /* _mesa_function_pool[25322]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[25080]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[25338]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[25101]: ListBase (offset 6) */
+   /* _mesa_function_pool[25359]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[25115]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[25373]: VertexAttribI3ivEXT (will be remapped) */
+   "ip\0"
+   "glVertexAttribI3ivEXT\0"
+   "glVertexAttribI3iv\0"
+   "\0"
+   /* _mesa_function_pool[25418]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[25131]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[25434]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25187]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[25490]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25279]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[25582]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25336]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[25639]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[25352]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[25655]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[25378]: Rectiv (offset 91) */
+   /* _mesa_function_pool[25681]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[25391]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[25694]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25429]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25732]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25456]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[25759]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[25506]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[25809]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[25529]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[25832]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[25548]: Tangent3ivEXT (dynamic) */
-   "p\0"
-   "glTangent3ivEXT\0"
+   /* _mesa_function_pool[25851]: GetSamplerParameteriv (will be remapped) */
+   "iip\0"
+   "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[25567]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[25880]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[25587]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[25900]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25633]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[25946]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[25666]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[25979]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[25681]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[25994]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[25726]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[26039]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[25771]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[26084]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[25817]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[26130]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[25852]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[26165]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[25867]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[26180]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[25915]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[26228]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25950]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[26263]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[25993]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[26306]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[26010]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[26323]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[26037]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[26350]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[26080]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26393]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26127]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[26440]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[26215]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[26528]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[26241]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[26554]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[26286]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[26599]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[26318]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[26631]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[26333]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[26646]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[26359]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26672]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26384]: LineWidth (offset 168) */
+   /* _mesa_function_pool[26697]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[26399]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[26712]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[26430]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[26743]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[26468]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[26781]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[26514]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[26827]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[26534]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[26847]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26555]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[26868]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[26585]: TexGendv (offset 189) */
+   /* _mesa_function_pool[26898]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[26601]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[26914]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[26646]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[26959]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[26679]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[26992]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[26704]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[27017]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[26725]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[27038]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[26759]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[27072]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[26786]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[27099]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[26809]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[27122]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[26835]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[27148]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[26899]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[27212]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26925]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[27238]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[26969]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[27282]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[27000]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[27313]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[27037]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[27350]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27058]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[27371]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[27080]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[27393]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[27115]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[27428]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[27136]: CallList (offset 2) */
+   /* _mesa_function_pool[27449]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[27150]: Materialfv (offset 170) */
+   /* _mesa_function_pool[27463]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27168]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[27481]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[27185]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[27498]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[27217]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[27530]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[27262]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[27575]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[27310]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[27623]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[27355]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27668]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[27373]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[27686]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27426]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[27739]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[27457]: Color3iv (offset 16) */
+   /* _mesa_function_pool[27770]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[27471]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[27784]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[27505]: DrawElements (offset 311) */
+   /* _mesa_function_pool[27818]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[27526]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[27839]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[27552]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[27865]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[27589]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[27902]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[27649]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[27962]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[27692]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[28005]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[27747]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[28060]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[27770]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[28083]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27790]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[28103]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[27863]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[28176]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[27886]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[28199]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27917]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28230]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[27954]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[28267]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[27971]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[28284]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[28007]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[28320]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[28023]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[28336]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[28043]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[28356]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[28057]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[28370]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[28076]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[28389]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[28096]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[28409]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[28145]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[28458]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28191]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[28504]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[28210]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[28523]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[28236]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[28549]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[28279]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[28592]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[28304]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28617]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28349]: Map2d (offset 222) */
+   /* _mesa_function_pool[28662]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[28369]: Map2f (offset 223) */
+   /* _mesa_function_pool[28682]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[28389]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[28702]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[28414]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[28727]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[28431]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[28744]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28460]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[28773]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[28491]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[28804]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[28514]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[28827]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[28531]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[28844]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[28548]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[28861]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[28565]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[28878]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[28583]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[28896]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[28609]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[28922]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28635]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[28948]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[28691]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[29004]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[28710]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[29023]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[28727]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[29040]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28758]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[29071]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[28798]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[29111]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[28824]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[29137]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[28855]: Materialf (offset 169) */
+   /* _mesa_function_pool[29168]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[28872]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[29185]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[28917]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[29230]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[28942]: Materiali (offset 171) */
+   /* _mesa_function_pool[29255]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[28959]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[29272]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[28985]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[29298]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[29020]: Indexsv (offset 51) */
+   /* _mesa_function_pool[29333]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[29033]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[29346]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[29078]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[29391]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[29097]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[29410]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[29114]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[29427]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[29147]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[29460]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[29165]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[29478]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[29202]: Translated (offset 303) */
+   /* _mesa_function_pool[29515]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[29220]: Translatef (offset 304) */
+   /* _mesa_function_pool[29533]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[29238]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[29551]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[29273]: StencilMask (offset 209) */
+   /* _mesa_function_pool[29586]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[29290]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[29603]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29310]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[29623]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[29330]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[29643]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[29348]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[29661]: GetSamplerParameterIiv (will be remapped) */
+   "iip\0"
+   "glGetSamplerParameterIiv\0"
+   "\0"
+   /* _mesa_function_pool[29691]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[29374]: IsList (offset 287) */
+   /* _mesa_function_pool[29717]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[29386]: IsSync (will be remapped) */
+   /* _mesa_function_pool[29729]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[29398]: RenderMode (offset 196) */
+   /* _mesa_function_pool[29741]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[29414]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[29757]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[29447]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29790]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[29499]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[29842]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[29520]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29863]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[29557]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29900]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29585]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[29928]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[29627]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[29970]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[29670]: LoadName (offset 198) */
+   /* _mesa_function_pool[30013]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[29684]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[30027]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[29711]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[30054]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[29729]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[30072]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29763]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[30106]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[29814]: CullFace (offset 152) */
+   /* _mesa_function_pool[30157]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[29828]: BindTexture (offset 307) */
+   /* _mesa_function_pool[30171]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[29863]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30206]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29890]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[30233]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[29936]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[30279]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[29962]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[30305]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[29981]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[30324]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[30001]: Rectsv (offset 93) */
+   /* _mesa_function_pool[30344]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[30014]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[30357]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[30041]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[30384]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[30099]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30442]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[30125]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[30468]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[30188]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[30531]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[30243]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[30586]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[30270]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[30613]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[30291]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[30634]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[30313]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[30656]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[30341]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[30684]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[30365]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[30708]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[30410]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[30753]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[30429]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[30772]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[30476]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[30819]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[30503]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[30846]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[30519]: Recti (offset 90) */
+   /* _mesa_function_pool[30862]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[30533]: VertexAttribI3ivEXT (will be remapped) */
-   "ip\0"
-   "glVertexAttribI3ivEXT\0"
-   "glVertexAttribI3iv\0"
+   /* _mesa_function_pool[30876]: TrackMatrixNV (will be remapped) */
+   "iiii\0"
+   "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[30578]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[30898]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[30617]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30937]: SamplerParameterIuiv (will be remapped) */
+   "iip\0"
+   "glSamplerParameterIuiv\0"
+   "\0"
+   /* _mesa_function_pool[30965]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[30646]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30994]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[30685]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[31033]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[30721]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[31069]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30744]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[31092]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[30766]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[31114]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[30787]: Rectf (offset 88) */
+   /* _mesa_function_pool[31135]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[30801]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[31149]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[30824]: Indexfv (offset 47) */
+   /* _mesa_function_pool[31172]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[30837]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[31185]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[30883]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[31231]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[30935]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[31283]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[30970]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[31318]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[30990]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[31338]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[31017]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31365]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31032]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[31380]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[31069]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[31417]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[31112]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[31460]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[31128]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[31476]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[31154]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[31502]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[31173]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[31521]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[31195]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[31543]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[31214]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[31562]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[31231]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31579]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31258]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[31606]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[31272]: Fogfv (offset 154) */
+   /* _mesa_function_pool[31620]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[31284]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[31632]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31318]: InitNames (offset 197) */
+   /* _mesa_function_pool[31666]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[31332]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[31680]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[31347]: Minmax (offset 368) */
+   /* _mesa_function_pool[31695]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[31373]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[31721]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[31392]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[31740]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[31431]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[31779]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[31450]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[31798]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[31482]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[31830]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[31504]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[31852]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[31534]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[31882]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[31554]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[31902]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[31572]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[31920]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[31609]: Hint (offset 158) */
+   /* _mesa_function_pool[31957]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[31620]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31968]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[31634]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[31982]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[31677]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[32025]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[31706]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[32054]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[31761]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[32109]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[31811]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[32159]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[31829]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[32177]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[31880]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[32228]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[31927]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[32275]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[31951]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[32299]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[31982]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[32330]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[31997]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[32345]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32032]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[32380]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[32049]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[32397]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32069]: Begin (offset 7) */
+   /* _mesa_function_pool[32417]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[32080]: LightModeli (offset 165) */
+   /* _mesa_function_pool[32428]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[32098]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[32446]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[32143]: Rectfv (offset 89) */
+   /* _mesa_function_pool[32491]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[32156]: LightModelf (offset 163) */
+   /* _mesa_function_pool[32504]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[32174]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[32522]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32199]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[32547]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[32217]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[32565]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32253]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[32601]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[32279]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[32627]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[32302]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32650]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32341]: Disable (offset 214) */
+   /* _mesa_function_pool[32689]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[32354]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[32702]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[32399]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[32747]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32465]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32813]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32493]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[32841]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[32520]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[32868]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32554]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[32902]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[32573]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[32921]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[32615]: ColorMask (offset 210) */
+   /* _mesa_function_pool[32963]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[32633]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[32981]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[32658]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[33006]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32677]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[33025]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32707]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[33055]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32740]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[33088]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[32762]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[33110]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[32780]: Enable (offset 215) */
+   /* _mesa_function_pool[33128]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[32792]: LineStipple (offset 167) */
+   /* _mesa_function_pool[33140]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[32810]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[33158]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[32836]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[33184]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[32866]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[33214]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[32893]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[33241]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32947]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[33295]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[32990]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[33338]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[33023]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[33371]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[33049]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[33397]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[33064]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[33412]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[33095]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[33443]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[33116]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[33464]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[33146]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[33494]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[33186]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[33534]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[33223]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[33571]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[33247]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33595]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33272]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[33620]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[33293]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[33641]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4792,491 +4848,505 @@ static const char _mesa_function_pool[] =
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
    {  1577, AttachShader_remap_index },
-   {  9906, CreateProgram_remap_index },
-   { 23042, CreateShader_remap_index },
-   { 25529, DeleteProgram_remap_index },
-   { 18686, DeleteShader_remap_index },
-   { 23543, DetachShader_remap_index },
-   { 18052, GetAttachedShaders_remap_index },
-   {  4869, GetProgramInfoLog_remap_index },
+   {  9967, CreateProgram_remap_index },
+   { 23300, CreateShader_remap_index },
+   { 25832, DeleteProgram_remap_index },
+   { 18888, DeleteShader_remap_index },
+   { 23801, DetachShader_remap_index },
+   { 18202, GetAttachedShaders_remap_index },
+   {  4919, GetProgramInfoLog_remap_index },
    {   405, GetProgramiv_remap_index },
-   {  6542, GetShaderInfoLog_remap_index },
-   { 31154, GetShaderiv_remap_index },
-   { 13361, IsProgram_remap_index },
-   { 12282, IsShader_remap_index },
-   { 10036, StencilFuncSeparate_remap_index },
+   {  6627, GetShaderInfoLog_remap_index },
+   { 31502, GetShaderiv_remap_index },
+   { 13443, IsProgram_remap_index },
+   { 12364, IsShader_remap_index },
+   { 10097, StencilFuncSeparate_remap_index },
    {  3921, StencilMaskSeparate_remap_index },
-   {  7607, StencilOpSeparate_remap_index },
-   { 22330, UniformMatrix2x3fv_remap_index },
+   {  7692, StencilOpSeparate_remap_index },
+   { 22560, UniformMatrix2x3fv_remap_index },
    {  2847, UniformMatrix2x4fv_remap_index },
-   { 32866, UniformMatrix3x2fv_remap_index },
-   { 30476, UniformMatrix3x4fv_remap_index },
-   { 16309, UniformMatrix4x2fv_remap_index },
+   { 33214, UniformMatrix3x2fv_remap_index },
+   { 30819, UniformMatrix3x4fv_remap_index },
+   { 16406, UniformMatrix4x2fv_remap_index },
    {  3263, UniformMatrix4x3fv_remap_index },
-   {  5030, ClampColor_remap_index },
-   { 18106, ClearBufferfi_remap_index },
-   { 17548, ClearBufferfv_remap_index },
-   { 29499, ClearBufferiv_remap_index },
-   { 13566, ClearBufferuiv_remap_index },
-   { 19969, GetStringi_remap_index },
+   {  5080, ClampColor_remap_index },
+   { 18256, ClearBufferfi_remap_index },
+   { 17698, ClearBufferfv_remap_index },
+   { 29842, ClearBufferiv_remap_index },
+   { 13648, ClearBufferuiv_remap_index },
+   { 20199, GetStringi_remap_index },
    {  2788, TexBuffer_remap_index },
    {   938, FramebufferTexture_remap_index },
-   { 26555, GetBufferParameteri64v_remap_index },
-   { 10136, GetInteger64i_v_remap_index },
-   { 23356, VertexAttribDivisor_remap_index },
-   {  9924, LoadTransposeMatrixdARB_remap_index },
-   { 30883, LoadTransposeMatrixfARB_remap_index },
-   {  5608, MultTransposeMatrixdARB_remap_index },
-   { 23730, MultTransposeMatrixfARB_remap_index },
+   { 26868, GetBufferParameteri64v_remap_index },
+   { 10197, GetInteger64i_v_remap_index },
+   { 23614, VertexAttribDivisor_remap_index },
+   {  9985, LoadTransposeMatrixdARB_remap_index },
+   { 31231, LoadTransposeMatrixfARB_remap_index },
+   {  5693, MultTransposeMatrixdARB_remap_index },
+   { 23988, MultTransposeMatrixfARB_remap_index },
    {   216, SampleCoverageARB_remap_index },
-   {  5834, CompressedTexImage1DARB_remap_index },
-   { 24258, CompressedTexImage2DARB_remap_index },
+   {  5919, CompressedTexImage1DARB_remap_index },
+   { 24516, CompressedTexImage2DARB_remap_index },
    {  3984, CompressedTexImage3DARB_remap_index },
-   { 18403, CompressedTexSubImage1DARB_remap_index },
+   { 18544, CompressedTexSubImage1DARB_remap_index },
    {  2050, CompressedTexSubImage2DARB_remap_index },
-   { 20391, CompressedTexSubImage3DARB_remap_index },
-   { 28635, GetCompressedTexImageARB_remap_index },
+   { 20621, CompressedTexSubImage3DARB_remap_index },
+   { 28948, GetCompressedTexImageARB_remap_index },
    {  3829, DisableVertexAttribArrayARB_remap_index },
-   { 30041, EnableVertexAttribArrayARB_remap_index },
-   { 31997, GetProgramEnvParameterdvARB_remap_index },
-   { 23610, GetProgramEnvParameterfvARB_remap_index },
-   { 27552, GetProgramLocalParameterdvARB_remap_index },
-   {  8049, GetProgramLocalParameterfvARB_remap_index },
-   { 18537, GetProgramStringARB_remap_index },
-   { 27747, GetProgramivARB_remap_index },
-   { 20586, GetVertexAttribdvARB_remap_index },
-   { 16117, GetVertexAttribfvARB_remap_index },
-   {  9748, GetVertexAttribivARB_remap_index },
-   { 19450, ProgramEnvParameter4dARB_remap_index },
-   { 25279, ProgramEnvParameter4dvARB_remap_index },
-   { 16870, ProgramEnvParameter4fARB_remap_index },
-   {  8948, ProgramEnvParameter4fvARB_remap_index },
+   { 30384, EnableVertexAttribArrayARB_remap_index },
+   { 32345, GetProgramEnvParameterdvARB_remap_index },
+   { 23868, GetProgramEnvParameterfvARB_remap_index },
+   { 27865, GetProgramLocalParameterdvARB_remap_index },
+   {  8134, GetProgramLocalParameterfvARB_remap_index },
+   { 18720, GetProgramStringARB_remap_index },
+   { 28060, GetProgramivARB_remap_index },
+   { 20816, GetVertexAttribdvARB_remap_index },
+   { 16214, GetVertexAttribfvARB_remap_index },
+   {  9809, GetVertexAttribivARB_remap_index },
+   { 19662, ProgramEnvParameter4dARB_remap_index },
+   { 25582, ProgramEnvParameter4dvARB_remap_index },
+   { 17020, ProgramEnvParameter4fARB_remap_index },
+   {  9009, ProgramEnvParameter4fvARB_remap_index },
    {  3947, ProgramLocalParameter4dARB_remap_index },
-   { 13071, ProgramLocalParameter4dvARB_remap_index },
-   { 29520, ProgramLocalParameter4fARB_remap_index },
-   { 25915, ProgramLocalParameter4fvARB_remap_index },
-   { 28389, ProgramStringARB_remap_index },
-   { 19700, VertexAttrib1dARB_remap_index },
-   { 15771, VertexAttrib1dvARB_remap_index },
-   {  4122, VertexAttrib1fARB_remap_index },
-   { 32947, VertexAttrib1fvARB_remap_index },
-   {  7133, VertexAttrib1sARB_remap_index },
+   { 13153, ProgramLocalParameter4dvARB_remap_index },
+   { 29863, ProgramLocalParameter4fARB_remap_index },
+   { 26228, ProgramLocalParameter4fvARB_remap_index },
+   { 28702, ProgramStringARB_remap_index },
+   { 19930, VertexAttrib1dARB_remap_index },
+   { 15868, VertexAttrib1dvARB_remap_index },
+   {  4143, VertexAttrib1fARB_remap_index },
+   { 33295, VertexAttrib1fvARB_remap_index },
+   {  7218, VertexAttrib1sARB_remap_index },
    {  2224, VertexAttrib1svARB_remap_index },
-   { 15202, VertexAttrib2dARB_remap_index },
-   { 17569, VertexAttrib2dvARB_remap_index },
+   { 15299, VertexAttrib2dARB_remap_index },
+   { 17719, VertexAttrib2dvARB_remap_index },
    {  1596, VertexAttrib2fARB_remap_index },
-   { 17682, VertexAttrib2fvARB_remap_index },
-   { 32573, VertexAttrib2sARB_remap_index },
-   { 31634, VertexAttrib2svARB_remap_index },
-   { 11287, VertexAttrib3dARB_remap_index },
-   {  8615, VertexAttrib3dvARB_remap_index },
+   { 17832, VertexAttrib2fvARB_remap_index },
+   { 32921, VertexAttrib2sARB_remap_index },
+   { 31982, VertexAttrib2svARB_remap_index },
+   { 11348, VertexAttrib3dARB_remap_index },
+   {  8676, VertexAttrib3dvARB_remap_index },
    {  1683, VertexAttrib3fARB_remap_index },
-   { 22593, VertexAttrib3fvARB_remap_index },
-   { 28236, VertexAttrib3sARB_remap_index },
-   { 20328, VertexAttrib3svARB_remap_index },
-   {  4895, VertexAttrib4NbvARB_remap_index },
-   { 17929, VertexAttrib4NivARB_remap_index },
-   { 22548, VertexAttrib4NsvARB_remap_index },
-   { 23562, VertexAttrib4NubARB_remap_index },
-   { 31880, VertexAttrib4NubvARB_remap_index },
-   { 19111, VertexAttrib4NuivARB_remap_index },
+   { 22851, VertexAttrib3fvARB_remap_index },
+   { 28549, VertexAttrib3sARB_remap_index },
+   { 20558, VertexAttrib3svARB_remap_index },
+   {  4945, VertexAttrib4NbvARB_remap_index },
+   { 18079, VertexAttrib4NivARB_remap_index },
+   { 22806, VertexAttrib4NsvARB_remap_index },
+   { 23820, VertexAttrib4NubARB_remap_index },
+   { 32228, VertexAttrib4NubvARB_remap_index },
+   { 19313, VertexAttrib4NuivARB_remap_index },
    {  3136, VertexAttrib4NusvARB_remap_index },
-   { 10876, VertexAttrib4bvARB_remap_index },
-   { 26925, VertexAttrib4dARB_remap_index },
-   { 21350, VertexAttrib4dvARB_remap_index },
-   { 11441, VertexAttrib4fARB_remap_index },
-   { 11845, VertexAttrib4fvARB_remap_index },
-   { 10252, VertexAttrib4ivARB_remap_index },
-   { 17362, VertexAttrib4sARB_remap_index },
-   { 31069, VertexAttrib4svARB_remap_index },
-   { 16675, VertexAttrib4ubvARB_remap_index },
-   { 30365, VertexAttrib4uivARB_remap_index },
-   { 20139, VertexAttrib4usvARB_remap_index },
-   { 22145, VertexAttribPointerARB_remap_index },
-   { 32707, BindBufferARB_remap_index },
-   {  6840, BufferDataARB_remap_index },
+   { 10937, VertexAttrib4bvARB_remap_index },
+   { 27238, VertexAttrib4dARB_remap_index },
+   { 21580, VertexAttrib4dvARB_remap_index },
+   { 11502, VertexAttrib4fARB_remap_index },
+   { 11906, VertexAttrib4fvARB_remap_index },
+   { 10313, VertexAttrib4ivARB_remap_index },
+   { 17512, VertexAttrib4sARB_remap_index },
+   { 31417, VertexAttrib4svARB_remap_index },
+   { 16825, VertexAttrib4ubvARB_remap_index },
+   { 30708, VertexAttrib4uivARB_remap_index },
+   { 20369, VertexAttrib4usvARB_remap_index },
+   { 22375, VertexAttribPointerARB_remap_index },
+   { 33055, BindBufferARB_remap_index },
+   {  6925, BufferDataARB_remap_index },
    {  1498, BufferSubDataARB_remap_index },
-   { 30646, DeleteBuffersARB_remap_index },
-   { 32990, GenBuffersARB_remap_index },
-   { 17725, GetBufferParameterivARB_remap_index },
-   { 16822, GetBufferPointervARB_remap_index },
+   { 30994, DeleteBuffersARB_remap_index },
+   { 33338, GenBuffersARB_remap_index },
+   { 17875, GetBufferParameterivARB_remap_index },
+   { 16972, GetBufferPointervARB_remap_index },
    {  1451, GetBufferSubDataARB_remap_index },
-   { 30313, IsBufferARB_remap_index },
-   { 26399, MapBufferARB_remap_index },
-   { 31284, UnmapBufferARB_remap_index },
+   { 30656, IsBufferARB_remap_index },
+   { 26712, MapBufferARB_remap_index },
+   { 31632, UnmapBufferARB_remap_index },
    {   312, BeginQueryARB_remap_index },
-   { 19795, DeleteQueriesARB_remap_index },
-   { 12172, EndQueryARB_remap_index },
-   { 29114, GenQueriesARB_remap_index },
+   { 20025, DeleteQueriesARB_remap_index },
+   { 12225, EndQueryARB_remap_index },
+   { 29427, GenQueriesARB_remap_index },
    {  1942, GetQueryObjectivARB_remap_index },
-   { 17406, GetQueryObjectuivARB_remap_index },
+   { 17556, GetQueryObjectuivARB_remap_index },
    {  1740, GetQueryivARB_remap_index },
-   { 20046, IsQueryARB_remap_index },
-   {  8225, AttachObjectARB_remap_index },
-   { 18648, CompileShaderARB_remap_index },
+   { 20276, IsQueryARB_remap_index },
+   {  8286, AttachObjectARB_remap_index },
+   { 18850, CompileShaderARB_remap_index },
    {  3205, CreateProgramObjectARB_remap_index },
-   {  6785, CreateShaderObjectARB_remap_index },
-   { 14504, DeleteObjectARB_remap_index },
-   { 24049, DetachObjectARB_remap_index },
-   { 11917, GetActiveUniformARB_remap_index },
-   {  9423, GetAttachedObjectsARB_remap_index },
-   {  9730, GetHandleARB_remap_index },
-   { 32740, GetInfoLogARB_remap_index },
-   { 31951, GetObjectParameterfvARB_remap_index },
-   { 27426, GetObjectParameterivARB_remap_index },
-   { 28872, GetShaderSourceARB_remap_index },
-   { 28096, GetUniformLocationARB_remap_index },
-   { 23832, GetUniformfvARB_remap_index },
-   { 12646, GetUniformivARB_remap_index },
-   { 20184, LinkProgramARB_remap_index },
-   { 20242, ShaderSourceARB_remap_index },
-   {  7507, Uniform1fARB_remap_index },
-   { 29729, Uniform1fvARB_remap_index },
-   { 22114, Uniform1iARB_remap_index },
-   { 21039, Uniform1ivARB_remap_index },
+   {  6870, CreateShaderObjectARB_remap_index },
+   { 14601, DeleteObjectARB_remap_index },
+   { 24307, DetachObjectARB_remap_index },
+   { 11970, GetActiveUniformARB_remap_index },
+   {  9484, GetAttachedObjectsARB_remap_index },
+   {  9791, GetHandleARB_remap_index },
+   { 33088, GetInfoLogARB_remap_index },
+   { 32299, GetObjectParameterfvARB_remap_index },
+   { 27739, GetObjectParameterivARB_remap_index },
+   { 29185, GetShaderSourceARB_remap_index },
+   { 28409, GetUniformLocationARB_remap_index },
+   { 24090, GetUniformfvARB_remap_index },
+   { 12728, GetUniformivARB_remap_index },
+   { 20414, LinkProgramARB_remap_index },
+   { 20472, ShaderSourceARB_remap_index },
+   {  7592, Uniform1fARB_remap_index },
+   { 30072, Uniform1fvARB_remap_index },
+   { 22344, Uniform1iARB_remap_index },
+   { 21269, Uniform1ivARB_remap_index },
    {  2173, Uniform2fARB_remap_index },
-   { 14340, Uniform2fvARB_remap_index },
-   { 26286, Uniform2iARB_remap_index },
+   { 14437, Uniform2fvARB_remap_index },
+   { 26599, Uniform2iARB_remap_index },
    {  2293, Uniform2ivARB_remap_index },
-   { 18758, Uniform3fARB_remap_index },
-   {  9453, Uniform3fvARB_remap_index },
-   {  6396, Uniform3iARB_remap_index },
-   { 16928, Uniform3ivARB_remap_index },
-   { 19256, Uniform4fARB_remap_index },
-   { 23696, Uniform4fvARB_remap_index },
-   { 24958, Uniform4iARB_remap_index },
-   { 20552, Uniform4ivARB_remap_index },
-   {  8277, UniformMatrix2fvARB_remap_index },
+   { 18960, Uniform3fARB_remap_index },
+   {  9514, Uniform3fvARB_remap_index },
+   {  6481, Uniform3iARB_remap_index },
+   { 17078, Uniform3ivARB_remap_index },
+   { 19468, Uniform4fARB_remap_index },
+   { 23954, Uniform4fvARB_remap_index },
+   { 25216, Uniform4iARB_remap_index },
+   { 20782, Uniform4ivARB_remap_index },
+   {  8338, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2690, UniformMatrix4fvARB_remap_index },
-   { 25391, UseProgramObjectARB_remap_index },
-   { 14890, ValidateProgramARB_remap_index },
-   { 21393, BindAttribLocationARB_remap_index },
-   {  4940, GetActiveAttribARB_remap_index },
-   { 16576, GetAttribLocationARB_remap_index },
-   { 29447, DrawBuffersARB_remap_index },
-   { 29310, ClampColorARB_remap_index },
-   { 17974, DrawArraysInstancedARB_remap_index },
-   {  6457, DrawElementsInstancedARB_remap_index },
-   { 13176, RenderbufferStorageMultisample_remap_index },
-   { 13647, FramebufferTextureARB_remap_index },
-   { 25817, FramebufferTextureFaceARB_remap_index },
-   { 24198, ProgramParameteriARB_remap_index },
-   { 23514, VertexAttribDivisorARB_remap_index },
-   { 19304, FlushMappedBufferRange_remap_index },
-   { 27863, MapBufferRange_remap_index },
-   { 27770, TexBufferARB_remap_index },
-   { 16420, BindVertexArray_remap_index },
-   { 14713, GenVertexArrays_remap_index },
-   { 30243, CopyBufferSubData_remap_index },
-   { 31173, ClientWaitSync_remap_index },
+   { 25694, UseProgramObjectARB_remap_index },
+   { 14987, ValidateProgramARB_remap_index },
+   { 21623, BindAttribLocationARB_remap_index },
+   {  4990, GetActiveAttribARB_remap_index },
+   { 16726, GetAttribLocationARB_remap_index },
+   { 29790, DrawBuffersARB_remap_index },
+   { 29623, ClampColorARB_remap_index },
+   { 18124, DrawArraysInstancedARB_remap_index },
+   {  6542, DrawElementsInstancedARB_remap_index },
+   { 13258, RenderbufferStorageMultisample_remap_index },
+   { 13729, FramebufferTextureARB_remap_index },
+   { 26130, FramebufferTextureFaceARB_remap_index },
+   { 24456, ProgramParameteriARB_remap_index },
+   { 23772, VertexAttribDivisorARB_remap_index },
+   { 19516, FlushMappedBufferRange_remap_index },
+   { 28176, MapBufferRange_remap_index },
+   { 28083, TexBufferARB_remap_index },
+   { 16544, BindVertexArray_remap_index },
+   { 14810, GenVertexArrays_remap_index },
+   { 30586, CopyBufferSubData_remap_index },
+   { 31521, ClientWaitSync_remap_index },
    {  2609, DeleteSync_remap_index },
-   {  7174, FenceSync_remap_index },
-   { 15261, GetInteger64v_remap_index },
-   { 22655, GetSynciv_remap_index },
-   { 29386, IsSync_remap_index },
-   {  9371, WaitSync_remap_index },
+   {  7259, FenceSync_remap_index },
+   { 15358, GetInteger64v_remap_index },
+   { 22913, GetSynciv_remap_index },
+   { 29729, IsSync_remap_index },
+   {  9432, WaitSync_remap_index },
    {  3797, DrawElementsBaseVertex_remap_index },
-   { 30578, DrawRangeElementsBaseVertex_remap_index },
-   { 26430, MultiDrawElementsBaseVertex_remap_index },
-   { 16642, BlendEquationSeparateiARB_remap_index },
-   { 17818, BlendEquationiARB_remap_index },
-   { 12615, BlendFuncSeparateiARB_remap_index },
-   {  9796, BlendFunciARB_remap_index },
-   {  5091, BindTransformFeedback_remap_index },
+   { 30898, DrawRangeElementsBaseVertex_remap_index },
+   { 26743, MultiDrawElementsBaseVertex_remap_index },
+   { 16792, BlendEquationSeparateiARB_remap_index },
+   { 17968, BlendEquationiARB_remap_index },
+   { 12697, BlendFuncSeparateiARB_remap_index },
+   {  9857, BlendFunciARB_remap_index },
+   {  8200, BindSampler_remap_index },
+   {  4122, DeleteSamplers_remap_index },
+   { 19889, GenSamplers_remap_index },
+   { 29661, GetSamplerParameterIiv_remap_index },
+   { 19410, GetSamplerParameterIuiv_remap_index },
+   {  4839, GetSamplerParameterfv_remap_index },
+   { 25851, GetSamplerParameteriv_remap_index },
+   { 14355, IsSampler_remap_index },
+   { 16497, SamplerParameterIiv_remap_index },
+   { 30937, SamplerParameterIuiv_remap_index },
+   { 22612, SamplerParameterf_remap_index },
+   { 16653, SamplerParameterfv_remap_index },
+   { 22587, SamplerParameteri_remap_index },
+   { 18318, SamplerParameteriv_remap_index },
+   {  5141, BindTransformFeedback_remap_index },
    {  3232, DeleteTransformFeedbacks_remap_index },
-   {  6429, DrawTransformFeedback_remap_index },
-   {  9590, GenTransformFeedbacks_remap_index },
-   { 28279, IsTransformFeedback_remap_index },
-   { 26010, PauseTransformFeedback_remap_index },
-   {  5528, ResumeTransformFeedback_remap_index },
-   { 21713, ClearDepthf_remap_index },
-   {  6733, DepthRangef_remap_index },
-   { 14525, GetShaderPrecisionFormat_remap_index },
-   {  9976, ReleaseShaderCompiler_remap_index },
-   { 10919, ShaderBinary_remap_index },
-   {  5396, PolygonOffsetEXT_remap_index },
-   { 23277, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4417, GetPixelTexGenParameterivSGIS_remap_index },
-   { 23010, PixelTexGenParameterfSGIS_remap_index },
+   {  6514, DrawTransformFeedback_remap_index },
+   {  9651, GenTransformFeedbacks_remap_index },
+   { 28592, IsTransformFeedback_remap_index },
+   { 26323, PauseTransformFeedback_remap_index },
+   {  5578, ResumeTransformFeedback_remap_index },
+   { 21943, ClearDepthf_remap_index },
+   {  6818, DepthRangef_remap_index },
+   { 14622, GetShaderPrecisionFormat_remap_index },
+   { 10037, ReleaseShaderCompiler_remap_index },
+   { 10980, ShaderBinary_remap_index },
+   {  5446, PolygonOffsetEXT_remap_index },
+   { 23535, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4438, GetPixelTexGenParameterivSGIS_remap_index },
+   { 23268, PixelTexGenParameterfSGIS_remap_index },
    {   624, PixelTexGenParameterfvSGIS_remap_index },
-   { 12684, PixelTexGenParameteriSGIS_remap_index },
-   { 13821, PixelTexGenParameterivSGIS_remap_index },
-   { 18302, SampleMaskSGIS_remap_index },
-   { 19986, SamplePatternSGIS_remap_index },
-   { 26359, ColorPointerEXT_remap_index },
-   { 17612, EdgeFlagPointerEXT_remap_index },
-   {  6050, IndexPointerEXT_remap_index },
-   {  6130, NormalPointerEXT_remap_index },
-   { 15855, TexCoordPointerEXT_remap_index },
-   {  6963, VertexPointerEXT_remap_index },
+   { 12766, PixelTexGenParameteriSGIS_remap_index },
+   { 13903, PixelTexGenParameterivSGIS_remap_index },
+   { 18443, SampleMaskSGIS_remap_index },
+   { 20216, SamplePatternSGIS_remap_index },
+   { 26672, ColorPointerEXT_remap_index },
+   { 17762, EdgeFlagPointerEXT_remap_index },
+   {  6135, IndexPointerEXT_remap_index },
+   {  6215, NormalPointerEXT_remap_index },
+   { 15952, TexCoordPointerEXT_remap_index },
+   {  7048, VertexPointerEXT_remap_index },
    {  3599, PointParameterfEXT_remap_index },
-   {  7814, PointParameterfvEXT_remap_index },
-   { 32049, LockArraysEXT_remap_index },
-   { 14954, UnlockArraysEXT_remap_index },
+   {  7899, PointParameterfvEXT_remap_index },
+   { 32397, LockArraysEXT_remap_index },
+   { 15051, UnlockArraysEXT_remap_index },
    {  1267, SecondaryColor3bEXT_remap_index },
-   {  7973, SecondaryColor3bvEXT_remap_index },
-   { 10429, SecondaryColor3dEXT_remap_index },
-   { 25587, SecondaryColor3dvEXT_remap_index },
-   { 28145, SecondaryColor3fEXT_remap_index },
-   { 18339, SecondaryColor3fvEXT_remap_index },
+   {  8058, SecondaryColor3bvEXT_remap_index },
+   { 10490, SecondaryColor3dEXT_remap_index },
+   { 25900, SecondaryColor3dvEXT_remap_index },
+   { 28458, SecondaryColor3fEXT_remap_index },
+   { 18480, SecondaryColor3fvEXT_remap_index },
    {   470, SecondaryColor3iEXT_remap_index },
-   { 16165, SecondaryColor3ivEXT_remap_index },
-   { 10064, SecondaryColor3sEXT_remap_index },
-   { 30837, SecondaryColor3svEXT_remap_index },
-   { 27262, SecondaryColor3ubEXT_remap_index },
-   { 21284, SecondaryColor3ubvEXT_remap_index },
-   { 12926, SecondaryColor3uiEXT_remap_index },
-   { 22897, SecondaryColor3uivEXT_remap_index },
-   { 25867, SecondaryColor3usEXT_remap_index },
-   { 12999, SecondaryColor3usvEXT_remap_index },
-   { 11788, SecondaryColorPointerEXT_remap_index },
-   { 25681, MultiDrawArraysEXT_remap_index },
-   { 20974, MultiDrawElementsEXT_remap_index },
-   { 21169, FogCoordPointerEXT_remap_index },
-   {  4566, FogCoorddEXT_remap_index },
-   { 31450, FogCoorddvEXT_remap_index },
-   {  4683, FogCoordfEXT_remap_index },
-   { 27185, FogCoordfvEXT_remap_index },
-   { 19208, PixelTexGenSGIX_remap_index },
-   { 27790, BlendFuncSeparateEXT_remap_index },
-   {  6875, FlushVertexArrayRangeNV_remap_index },
-   {  5345, VertexArrayRangeNV_remap_index },
-   { 28210, CombinerInputNV_remap_index },
+   { 16262, SecondaryColor3ivEXT_remap_index },
+   { 10125, SecondaryColor3sEXT_remap_index },
+   { 31185, SecondaryColor3svEXT_remap_index },
+   { 27575, SecondaryColor3ubEXT_remap_index },
+   { 21514, SecondaryColor3ubvEXT_remap_index },
+   { 13008, SecondaryColor3uiEXT_remap_index },
+   { 23155, SecondaryColor3uivEXT_remap_index },
+   { 26180, SecondaryColor3usEXT_remap_index },
+   { 13081, SecondaryColor3usvEXT_remap_index },
+   { 11849, SecondaryColorPointerEXT_remap_index },
+   { 25994, MultiDrawArraysEXT_remap_index },
+   { 21204, MultiDrawElementsEXT_remap_index },
+   { 21399, FogCoordPointerEXT_remap_index },
+   {  4587, FogCoorddEXT_remap_index },
+   { 31798, FogCoorddvEXT_remap_index },
+   {  4704, FogCoordfEXT_remap_index },
+   { 27498, FogCoordfvEXT_remap_index },
+   { 11949, PixelTexGenSGIX_remap_index },
+   { 28103, BlendFuncSeparateEXT_remap_index },
+   {  6960, FlushVertexArrayRangeNV_remap_index },
+   {  5395, VertexArrayRangeNV_remap_index },
+   { 28523, CombinerInputNV_remap_index },
    {  2116, CombinerOutputNV_remap_index },
-   { 30990, CombinerParameterfNV_remap_index },
-   {  5219, CombinerParameterfvNV_remap_index },
-   { 22379, CombinerParameteriNV_remap_index },
-   { 32465, CombinerParameterivNV_remap_index },
-   {  7251, FinalCombinerInputNV_remap_index },
-   {  9817, GetCombinerInputParameterfvNV_remap_index },
-   { 32302, GetCombinerInputParameterivNV_remap_index },
-   { 13922, GetCombinerOutputParameterfvNV_remap_index },
-   { 13750, GetCombinerOutputParameterivNV_remap_index },
-   {  6637, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 24830, GetFinalCombinerInputParameterivNV_remap_index },
-   { 12593, ResizeBuffersMESA_remap_index },
-   { 11114, WindowPos2dMESA_remap_index },
+   { 31338, CombinerParameterfNV_remap_index },
+   {  5269, CombinerParameterfvNV_remap_index },
+   { 22637, CombinerParameteriNV_remap_index },
+   { 32813, CombinerParameterivNV_remap_index },
+   {  7336, FinalCombinerInputNV_remap_index },
+   {  9878, GetCombinerInputParameterfvNV_remap_index },
+   { 32650, GetCombinerInputParameterivNV_remap_index },
+   { 14004, GetCombinerOutputParameterfvNV_remap_index },
+   { 13832, GetCombinerOutputParameterivNV_remap_index },
+   {  6722, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 25088, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12675, ResizeBuffersMESA_remap_index },
+   { 11175, WindowPos2dMESA_remap_index },
    {  1060, WindowPos2dvMESA_remap_index },
-   { 33293, WindowPos2fMESA_remap_index },
-   {  7918, WindowPos2fvMESA_remap_index },
-   { 18249, WindowPos2iMESA_remap_index },
-   { 20459, WindowPos2ivMESA_remap_index },
-   { 21073, WindowPos2sMESA_remap_index },
-   {  5748, WindowPos2svMESA_remap_index },
-   {  7743, WindowPos3dMESA_remap_index },
-   { 14068, WindowPos3dvMESA_remap_index },
+   { 33641, WindowPos2fMESA_remap_index },
+   {  8003, WindowPos2fvMESA_remap_index },
+   { 18390, WindowPos2iMESA_remap_index },
+   { 20689, WindowPos2ivMESA_remap_index },
+   { 21303, WindowPos2sMESA_remap_index },
+   {  5833, WindowPos2svMESA_remap_index },
+   {  7828, WindowPos3dMESA_remap_index },
+   { 14150, WindowPos3dvMESA_remap_index },
    {   516, WindowPos3fMESA_remap_index },
-   { 15015, WindowPos3fvMESA_remap_index },
-   { 24091, WindowPos3iMESA_remap_index },
-   { 30188, WindowPos3ivMESA_remap_index },
-   { 18903, WindowPos3sMESA_remap_index },
-   { 31706, WindowPos3svMESA_remap_index },
-   { 11065, WindowPos4dMESA_remap_index },
-   { 17066, WindowPos4dvMESA_remap_index },
-   { 14027, WindowPos4fMESA_remap_index },
-   { 30744, WindowPos4fvMESA_remap_index },
-   { 30341, WindowPos4iMESA_remap_index },
-   { 12396, WindowPos4ivMESA_remap_index },
-   { 19087, WindowPos4sMESA_remap_index },
+   { 15112, WindowPos3fvMESA_remap_index },
+   { 24349, WindowPos3iMESA_remap_index },
+   { 30531, WindowPos3ivMESA_remap_index },
+   { 19105, WindowPos3sMESA_remap_index },
+   { 32054, WindowPos3svMESA_remap_index },
+   { 11126, WindowPos4dMESA_remap_index },
+   { 17216, WindowPos4dvMESA_remap_index },
+   { 14109, WindowPos4fMESA_remap_index },
+   { 31092, WindowPos4fvMESA_remap_index },
+   { 30684, WindowPos4iMESA_remap_index },
+   { 12478, WindowPos4ivMESA_remap_index },
+   { 19289, WindowPos4sMESA_remap_index },
    {  3183, WindowPos4svMESA_remap_index },
-   { 13789, MultiModeDrawArraysIBM_remap_index },
-   { 28985, MultiModeDrawElementsIBM_remap_index },
-   { 12200, DeleteFencesNV_remap_index },
-   { 28057, FinishFenceNV_remap_index },
+   { 13871, MultiModeDrawArraysIBM_remap_index },
+   { 29298, MultiModeDrawElementsIBM_remap_index },
+   { 12253, DeleteFencesNV_remap_index },
+   { 28370, FinishFenceNV_remap_index },
    {  3721, GenFencesNV_remap_index },
-   { 17046, GetFenceivNV_remap_index },
-   {  8210, IsFenceNV_remap_index },
-   { 13677, SetFenceNV_remap_index },
-   {  4178, TestFenceNV_remap_index },
-   { 31677, AreProgramsResidentNV_remap_index },
-   { 31032, BindProgramNV_remap_index },
-   { 25950, DeleteProgramsNV_remap_index },
-   { 21502, ExecuteProgramNV_remap_index },
-   { 33186, GenProgramsNV_remap_index },
-   { 23382, GetProgramParameterdvNV_remap_index },
-   { 10491, GetProgramParameterfvNV_remap_index },
-   { 26333, GetProgramStringNV_remap_index },
-   { 24468, GetProgramivNV_remap_index },
-   { 23645, GetTrackMatrixivNV_remap_index },
-   { 26127, GetVertexAttribPointervNV_remap_index },
-   { 24763, GetVertexAttribdvNV_remap_index },
-   {  9266, GetVertexAttribfvNV_remap_index },
-   { 18510, GetVertexAttribivNV_remap_index },
-   { 19334, IsProgramNV_remap_index },
-   {  9349, LoadProgramNV_remap_index },
-   { 27886, ProgramParameters4dvNV_remap_index },
-   { 24398, ProgramParameters4fvNV_remap_index },
-   { 20763, RequestResidentProgramsNV_remap_index },
-   { 22357, TrackMatrixNV_remap_index },
-   { 32279, VertexAttrib1dNV_remap_index },
-   { 13588, VertexAttrib1dvNV_remap_index },
-   { 28491, VertexAttrib1fNV_remap_index },
+   { 17196, GetFenceivNV_remap_index },
+   {  8271, IsFenceNV_remap_index },
+   { 13759, SetFenceNV_remap_index },
+   {  4199, TestFenceNV_remap_index },
+   { 32025, AreProgramsResidentNV_remap_index },
+   { 31380, BindProgramNV_remap_index },
+   { 26263, DeleteProgramsNV_remap_index },
+   { 21732, ExecuteProgramNV_remap_index },
+   { 33534, GenProgramsNV_remap_index },
+   { 23640, GetProgramParameterdvNV_remap_index },
+   { 10552, GetProgramParameterfvNV_remap_index },
+   { 26646, GetProgramStringNV_remap_index },
+   { 24726, GetProgramivNV_remap_index },
+   { 23903, GetTrackMatrixivNV_remap_index },
+   { 26440, GetVertexAttribPointervNV_remap_index },
+   { 25021, GetVertexAttribdvNV_remap_index },
+   {  9327, GetVertexAttribfvNV_remap_index },
+   { 18693, GetVertexAttribivNV_remap_index },
+   { 19546, IsProgramNV_remap_index },
+   {  9410, LoadProgramNV_remap_index },
+   { 28199, ProgramParameters4dvNV_remap_index },
+   { 24656, ProgramParameters4fvNV_remap_index },
+   { 20993, RequestResidentProgramsNV_remap_index },
+   { 30876, TrackMatrixNV_remap_index },
+   { 32627, VertexAttrib1dNV_remap_index },
+   { 13670, VertexAttrib1dvNV_remap_index },
+   { 28804, VertexAttrib1fNV_remap_index },
    {  2415, VertexAttrib1fvNV_remap_index },
-   { 30801, VertexAttrib1sNV_remap_index },
-   { 15088, VertexAttrib1svNV_remap_index },
-   {  4845, VertexAttrib2dNV_remap_index },
-   { 13481, VertexAttrib2dvNV_remap_index },
-   { 20218, VertexAttrib2fNV_remap_index },
-   { 13047, VertexAttrib2fvNV_remap_index },
-   {  5960, VertexAttrib2sNV_remap_index },
-   { 18957, VertexAttrib2svNV_remap_index },
-   { 11262, VertexAttrib3dNV_remap_index },
-   { 31927, VertexAttrib3dvNV_remap_index },
-   { 10303, VertexAttrib3fNV_remap_index },
-   { 24790, VertexAttrib3fvNV_remap_index },
-   { 22200, VertexAttrib3sNV_remap_index },
-   { 23672, VertexAttrib3svNV_remap_index },
-   { 28959, VertexAttrib4dNV_remap_index },
-   { 33223, VertexAttrib4dvNV_remap_index },
-   {  4467, VertexAttrib4fNV_remap_index },
-   {  9399, VertexAttrib4fvNV_remap_index },
-   { 26809, VertexAttrib4sNV_remap_index },
+   { 31149, VertexAttrib1sNV_remap_index },
+   { 15185, VertexAttrib1svNV_remap_index },
+   {  4895, VertexAttrib2dNV_remap_index },
+   { 13563, VertexAttrib2dvNV_remap_index },
+   { 20448, VertexAttrib2fNV_remap_index },
+   { 13129, VertexAttrib2fvNV_remap_index },
+   {  6045, VertexAttrib2sNV_remap_index },
+   { 19159, VertexAttrib2svNV_remap_index },
+   { 11323, VertexAttrib3dNV_remap_index },
+   { 32275, VertexAttrib3dvNV_remap_index },
+   { 10364, VertexAttrib3fNV_remap_index },
+   { 25048, VertexAttrib3fvNV_remap_index },
+   { 22430, VertexAttrib3sNV_remap_index },
+   { 23930, VertexAttrib3svNV_remap_index },
+   { 29272, VertexAttrib4dNV_remap_index },
+   { 33571, VertexAttrib4dvNV_remap_index },
+   {  4488, VertexAttrib4fNV_remap_index },
+   {  9460, VertexAttrib4fvNV_remap_index },
+   { 27122, VertexAttrib4sNV_remap_index },
    {  1409, VertexAttrib4svNV_remap_index },
-   {  5003, VertexAttrib4ubNV_remap_index },
+   {  5053, VertexAttrib4ubNV_remap_index },
    {   778, VertexAttrib4ubvNV_remap_index },
-   { 21682, VertexAttribPointerNV_remap_index },
+   { 21912, VertexAttribPointerNV_remap_index },
    {  2267, VertexAttribs1dvNV_remap_index },
-   { 26215, VertexAttribs1fvNV_remap_index },
-   { 33023, VertexAttribs1svNV_remap_index },
-   { 10328, VertexAttribs2dvNV_remap_index },
-   { 25352, VertexAttribs2fvNV_remap_index },
-   { 17638, VertexAttribs2svNV_remap_index },
-   {  5247, VertexAttribs3dvNV_remap_index },
+   { 26528, VertexAttribs1fvNV_remap_index },
+   { 33371, VertexAttribs1svNV_remap_index },
+   { 10389, VertexAttribs2dvNV_remap_index },
+   { 25655, VertexAttribs2fvNV_remap_index },
+   { 17788, VertexAttribs2svNV_remap_index },
+   {  5297, VertexAttribs3dvNV_remap_index },
    {  2147, VertexAttribs3fvNV_remap_index },
-   { 29936, VertexAttribs3svNV_remap_index },
-   { 26899, VertexAttribs4dvNV_remap_index },
-   {  5319, VertexAttribs4fvNV_remap_index },
-   { 32810, VertexAttribs4svNV_remap_index },
-   { 29684, VertexAttribs4ubvNV_remap_index },
-   { 26969, GetTexBumpParameterfvATI_remap_index },
-   { 33064, GetTexBumpParameterivATI_remap_index },
-   { 18620, TexBumpParameterfvATI_remap_index },
-   { 20634, TexBumpParameterivATI_remap_index },
-   { 15634, AlphaFragmentOp1ATI_remap_index },
-   { 25633, AlphaFragmentOp2ATI_remap_index },
-   { 24706, AlphaFragmentOp3ATI_remap_index },
-   { 29863, BeginFragmentShaderATI_remap_index },
-   { 31231, BindFragmentShaderATI_remap_index },
-   { 23801, ColorFragmentOp1ATI_remap_index },
-   {  4345, ColorFragmentOp2ATI_remap_index },
-   { 31572, ColorFragmentOp3ATI_remap_index },
-   {  5485, DeleteFragmentShaderATI_remap_index },
-   { 33247, EndFragmentShaderATI_remap_index },
-   { 32493, GenFragmentShadersATI_remap_index },
-   { 25506, PassTexCoordATI_remap_index },
-   {  6943, SampleMapATI_remap_index },
-   { 27080, SetFragmentShaderConstantATI_remap_index },
+   { 30279, VertexAttribs3svNV_remap_index },
+   { 27212, VertexAttribs4dvNV_remap_index },
+   {  5369, VertexAttribs4fvNV_remap_index },
+   { 33158, VertexAttribs4svNV_remap_index },
+   { 30027, VertexAttribs4ubvNV_remap_index },
+   { 27282, GetTexBumpParameterfvATI_remap_index },
+   { 33412, GetTexBumpParameterivATI_remap_index },
+   { 18803, TexBumpParameterfvATI_remap_index },
+   { 20864, TexBumpParameterivATI_remap_index },
+   { 15731, AlphaFragmentOp1ATI_remap_index },
+   { 25946, AlphaFragmentOp2ATI_remap_index },
+   { 24964, AlphaFragmentOp3ATI_remap_index },
+   { 30206, BeginFragmentShaderATI_remap_index },
+   { 31579, BindFragmentShaderATI_remap_index },
+   { 24059, ColorFragmentOp1ATI_remap_index },
+   {  4366, ColorFragmentOp2ATI_remap_index },
+   { 31920, ColorFragmentOp3ATI_remap_index },
+   {  5535, DeleteFragmentShaderATI_remap_index },
+   { 33595, EndFragmentShaderATI_remap_index },
+   { 32841, GenFragmentShadersATI_remap_index },
+   { 25809, PassTexCoordATI_remap_index },
+   {  7028, SampleMapATI_remap_index },
+   { 27393, SetFragmentShaderConstantATI_remap_index },
    {   363, PointParameteriNV_remap_index },
-   { 14229, PointParameterivNV_remap_index },
-   { 28798, ActiveStencilFaceEXT_remap_index },
-   { 27526, BindVertexArrayAPPLE_remap_index },
+   { 14311, PointParameterivNV_remap_index },
+   { 29111, ActiveStencilFaceEXT_remap_index },
+   { 27839, BindVertexArrayAPPLE_remap_index },
    {  2737, DeleteVertexArraysAPPLE_remap_index },
-   { 18079, GenVertexArraysAPPLE_remap_index },
-   { 23447, IsVertexArrayAPPLE_remap_index },
+   { 18229, GenVertexArraysAPPLE_remap_index },
+   { 23705, IsVertexArrayAPPLE_remap_index },
    {   819, GetProgramNamedParameterdvNV_remap_index },
    {  3562, GetProgramNamedParameterfvNV_remap_index },
-   { 27000, ProgramNamedParameter4dNV_remap_index },
-   { 14588, ProgramNamedParameter4dvNV_remap_index },
-   {  8882, ProgramNamedParameter4fNV_remap_index },
-   { 11753, ProgramNamedParameter4fvNV_remap_index },
-   { 16977, PrimitiveRestartIndexNV_remap_index },
-   { 30721, PrimitiveRestartNV_remap_index },
-   { 24377, DepthBoundsEXT_remap_index },
+   { 27313, ProgramNamedParameter4dNV_remap_index },
+   { 14685, ProgramNamedParameter4dvNV_remap_index },
+   {  8943, ProgramNamedParameter4fNV_remap_index },
+   { 11814, ProgramNamedParameter4fvNV_remap_index },
+   { 17127, PrimitiveRestartIndexNV_remap_index },
+   { 31069, PrimitiveRestartNV_remap_index },
+   { 24635, DepthBoundsEXT_remap_index },
    {  1159, BlendEquationSeparateEXT_remap_index },
-   { 14789, BindFramebufferEXT_remap_index },
-   { 25726, BindRenderbufferEXT_remap_index },
-   {  9646, CheckFramebufferStatusEXT_remap_index },
-   { 22698, DeleteFramebuffersEXT_remap_index },
-   { 31829, DeleteRenderbuffersEXT_remap_index },
-   { 13505, FramebufferRenderbufferEXT_remap_index },
-   { 13694, FramebufferTexture1DEXT_remap_index },
-   { 11547, FramebufferTexture2DEXT_remap_index },
-   { 11167, FramebufferTexture3DEXT_remap_index },
-   { 23313, GenFramebuffersEXT_remap_index },
-   { 17503, GenRenderbuffersEXT_remap_index },
-   {  6679, GenerateMipmapEXT_remap_index },
-   { 21775, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 32399, GetRenderbufferParameterivEXT_remap_index },
-   { 20514, IsFramebufferEXT_remap_index },
-   { 33146, IsRenderbufferEXT_remap_index },
-   {  8157, RenderbufferStorageEXT_remap_index },
+   { 14886, BindFramebufferEXT_remap_index },
+   { 26039, BindRenderbufferEXT_remap_index },
+   {  9707, CheckFramebufferStatusEXT_remap_index },
+   { 22956, DeleteFramebuffersEXT_remap_index },
+   { 32177, DeleteRenderbuffersEXT_remap_index },
+   { 13587, FramebufferRenderbufferEXT_remap_index },
+   { 13776, FramebufferTexture1DEXT_remap_index },
+   { 11608, FramebufferTexture2DEXT_remap_index },
+   { 11228, FramebufferTexture3DEXT_remap_index },
+   { 23571, GenFramebuffersEXT_remap_index },
+   { 17653, GenRenderbuffersEXT_remap_index },
+   {  6764, GenerateMipmapEXT_remap_index },
+   { 22005, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 32747, GetRenderbufferParameterivEXT_remap_index },
+   { 20744, IsFramebufferEXT_remap_index },
+   { 33494, IsRenderbufferEXT_remap_index },
+   {  8218, RenderbufferStorageEXT_remap_index },
    {   695, BlitFramebufferEXT_remap_index },
-   { 14374, BufferParameteriAPPLE_remap_index },
-   { 19366, FlushMappedBufferRangeAPPLE_remap_index },
+   { 14471, BufferParameteriAPPLE_remap_index },
+   { 19578, FlushMappedBufferRangeAPPLE_remap_index },
    {  1815, BindFragDataLocationEXT_remap_index },
-   { 24490, GetFragDataLocationEXT_remap_index },
-   { 10606, GetUniformuivEXT_remap_index },
+   { 24748, GetFragDataLocationEXT_remap_index },
+   { 10667, GetUniformuivEXT_remap_index },
    {  2933, GetVertexAttribIivEXT_remap_index },
-   {  4195, GetVertexAttribIuivEXT_remap_index },
-   { 12033, Uniform1uiEXT_remap_index },
-   { 27971, Uniform1uivEXT_remap_index },
-   { 22296, Uniform2uiEXT_remap_index },
-   {  4309, Uniform2uivEXT_remap_index },
-   { 29238, Uniform3uiEXT_remap_index },
-   { 14735, Uniform3uivEXT_remap_index },
+   {  4216, GetVertexAttribIuivEXT_remap_index },
+   { 12086, Uniform1uiEXT_remap_index },
+   { 28284, Uniform1uivEXT_remap_index },
+   { 22526, Uniform2uiEXT_remap_index },
+   {  4330, Uniform2uivEXT_remap_index },
+   { 29551, Uniform3uiEXT_remap_index },
+   { 14832, Uniform3uivEXT_remap_index },
    {  3486, Uniform4uiEXT_remap_index },
-   {  8658, Uniform4uivEXT_remap_index },
-   { 18467, VertexAttribI1iEXT_remap_index },
+   {  8719, Uniform4uivEXT_remap_index },
+   { 18608, VertexAttribI1iEXT_remap_index },
    {   965, VertexAttribI1ivEXT_remap_index },
    {  2516, VertexAttribI1uiEXT_remap_index },
-   { 12775, VertexAttribI1uivEXT_remap_index },
+   { 12857, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 23913, VertexAttribI2ivEXT_remap_index },
-   {  5273, VertexAttribI2uiEXT_remap_index },
-   {  4728, VertexAttribI2uivEXT_remap_index },
-   { 26601, VertexAttribI3iEXT_remap_index },
-   { 30533, VertexAttribI3ivEXT_remap_index },
+   { 24171, VertexAttribI2ivEXT_remap_index },
+   {  5323, VertexAttribI2uiEXT_remap_index },
+   {  4749, VertexAttribI2uivEXT_remap_index },
+   { 26914, VertexAttribI3iEXT_remap_index },
+   { 25373, VertexAttribI3ivEXT_remap_index },
    {  3340, VertexAttribI3uiEXT_remap_index },
-   { 30429, VertexAttribI3uivEXT_remap_index },
-   { 22026, VertexAttribI4bvEXT_remap_index },
-   { 14667, VertexAttribI4iEXT_remap_index },
-   { 32098, VertexAttribI4ivEXT_remap_index },
-   { 13408, VertexAttribI4svEXT_remap_index },
-   { 16529, VertexAttribI4ubvEXT_remap_index },
-   { 16228, VertexAttribI4uiEXT_remap_index },
-   {  5419, VertexAttribI4uivEXT_remap_index },
-   { 11330, VertexAttribI4usvEXT_remap_index },
-   { 18564, VertexAttribIPointerEXT_remap_index },
+   { 30772, VertexAttribI3uivEXT_remap_index },
+   { 22256, VertexAttribI4bvEXT_remap_index },
+   { 14764, VertexAttribI4iEXT_remap_index },
+   { 32446, VertexAttribI4ivEXT_remap_index },
+   { 13490, VertexAttribI4svEXT_remap_index },
+   { 16679, VertexAttribI4ubvEXT_remap_index },
+   { 16325, VertexAttribI4uiEXT_remap_index },
+   {  5469, VertexAttribI4uivEXT_remap_index },
+   { 11391, VertexAttribI4usvEXT_remap_index },
+   { 18747, VertexAttribIPointerEXT_remap_index },
    {  3027, FramebufferTextureLayerEXT_remap_index },
-   {  5660, ColorMaskIndexedEXT_remap_index },
-   { 18981, DisableIndexedEXT_remap_index },
-   { 26646, EnableIndexedEXT_remap_index },
-   { 21730, GetBooleanIndexedvEXT_remap_index },
-   { 10941, GetIntegerIndexedvEXT_remap_index },
-   { 22774, IsEnabledIndexedEXT_remap_index },
-   { 22674, ClearColorIiEXT_remap_index },
+   {  5745, ColorMaskIndexedEXT_remap_index },
+   { 19183, DisableIndexedEXT_remap_index },
+   { 26959, EnableIndexedEXT_remap_index },
+   { 21960, GetBooleanIndexedvEXT_remap_index },
+   { 11002, GetIntegerIndexedvEXT_remap_index },
+   { 23032, IsEnabledIndexedEXT_remap_index },
+   { 22932, ClearColorIiEXT_remap_index },
    {  3436, ClearColorIuiEXT_remap_index },
-   {  9856, GetTexParameterIivEXT_remap_index },
-   {  5908, GetTexParameterIuivEXT_remap_index },
+   {  9917, GetTexParameterIivEXT_remap_index },
+   {  5993, GetTexParameterIuivEXT_remap_index },
    {  2983, TexParameterIivEXT_remap_index },
-   { 26468, TexParameterIuivEXT_remap_index },
-   {  4596, BeginConditionalRenderNV_remap_index },
-   { 25456, EndConditionalRenderNV_remap_index },
-   {  9293, BeginTransformFeedbackEXT_remap_index },
-   { 19016, BindBufferBaseEXT_remap_index },
-   { 18875, BindBufferOffsetEXT_remap_index },
-   { 12221, BindBufferRangeEXT_remap_index },
-   { 14289, EndTransformFeedbackEXT_remap_index },
-   { 10804, GetTransformFeedbackVaryingEXT_remap_index },
-   { 20819, TransformFeedbackVaryingsEXT_remap_index },
-   { 29585, ProvokingVertexEXT_remap_index },
-   { 10752, GetTexParameterPointervAPPLE_remap_index },
-   {  5047, TextureRangeAPPLE_remap_index },
-   { 11619, GetObjectParameterivAPPLE_remap_index },
-   { 19941, ObjectPurgeableAPPLE_remap_index },
-   {  5702, ObjectUnpurgeableAPPLE_remap_index },
-   { 17325, ActiveProgramEXT_remap_index },
-   { 17296, CreateShaderProgramEXT_remap_index },
-   { 28583, UseShaderProgramEXT_remap_index },
-   { 16508, TextureBarrierNV_remap_index },
-   { 28824, StencilFuncSeparateATI_remap_index },
-   { 18168, ProgramEnvParameters4fvEXT_remap_index },
-   { 17190, ProgramLocalParameters4fvEXT_remap_index },
-   { 14157, GetQueryObjecti64vEXT_remap_index },
-   { 10354, GetQueryObjectui64vEXT_remap_index },
-   { 23870, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12139, EGLImageTargetTexture2DOES_remap_index },
+   { 26781, TexParameterIuivEXT_remap_index },
+   {  4617, BeginConditionalRenderNV_remap_index },
+   { 25759, EndConditionalRenderNV_remap_index },
+   {  9354, BeginTransformFeedbackEXT_remap_index },
+   { 19218, BindBufferBaseEXT_remap_index },
+   { 19077, BindBufferOffsetEXT_remap_index },
+   { 12303, BindBufferRangeEXT_remap_index },
+   { 14386, EndTransformFeedbackEXT_remap_index },
+   { 10865, GetTransformFeedbackVaryingEXT_remap_index },
+   { 21049, TransformFeedbackVaryingsEXT_remap_index },
+   { 29928, ProvokingVertexEXT_remap_index },
+   { 10813, GetTexParameterPointervAPPLE_remap_index },
+   {  5097, TextureRangeAPPLE_remap_index },
+   { 11680, GetObjectParameterivAPPLE_remap_index },
+   { 20171, ObjectPurgeableAPPLE_remap_index },
+   {  5787, ObjectUnpurgeableAPPLE_remap_index },
+   { 17475, ActiveProgramEXT_remap_index },
+   { 17446, CreateShaderProgramEXT_remap_index },
+   { 28896, UseShaderProgramEXT_remap_index },
+   { 16632, TextureBarrierNV_remap_index },
+   { 29137, StencilFuncSeparateATI_remap_index },
+   {  5658, ProgramEnvParameters4fvEXT_remap_index },
+   { 17340, ProgramLocalParameters4fvEXT_remap_index },
+   { 14239, GetQueryObjecti64vEXT_remap_index },
+   { 10415, GetQueryObjectui64vEXT_remap_index },
+   { 24128, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12192, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
@@ -5285,108 +5355,108 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2655, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 11224, _gloffset_BlendEquation },
+   { 11285, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 17088, _gloffset_ColorSubTable },
-   { 31761, _gloffset_CopyColorSubTable },
+   { 17238, _gloffset_ColorSubTable },
+   { 32109, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   257, _gloffset_ConvolutionFilter1D },
    {  2454, _gloffset_CopyConvolutionFilter1D },
    {  4058, _gloffset_GetConvolutionParameteriv },
-   {  8506, _gloffset_ConvolutionFilter2D },
-   {  8708, _gloffset_ConvolutionParameteriv },
-   {  9168, _gloffset_ConvolutionParameterfv },
-   { 20662, _gloffset_GetSeparableFilter },
-   { 24145, _gloffset_SeparableFilter2D },
-   { 25008, _gloffset_ConvolutionParameteri },
-   { 25131, _gloffset_ConvolutionParameterf },
-   { 26835, _gloffset_GetConvolutionParameterfv },
-   { 27692, _gloffset_GetConvolutionFilter },
-   { 30125, _gloffset_CopyConvolutionFilter2D },
+   {  8567, _gloffset_ConvolutionFilter2D },
+   {  8769, _gloffset_ConvolutionParameteriv },
+   {  9229, _gloffset_ConvolutionParameterfv },
+   { 20892, _gloffset_GetSeparableFilter },
+   { 24403, _gloffset_SeparableFilter2D },
+   { 25266, _gloffset_ConvolutionParameteri },
+   { 25434, _gloffset_ConvolutionParameterf },
+   { 27148, _gloffset_GetConvolutionParameterfv },
+   { 28005, _gloffset_GetConvolutionFilter },
+   { 30468, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 15148, _gloffset_CopyTexSubImage3D },
-   { 16775, _gloffset_CopyTexImage2D },
-   { 24616, _gloffset_CopyTexImage1D },
-   { 27373, _gloffset_CopyTexSubImage2D },
-   { 29763, _gloffset_CopyTexSubImage1D },
+   { 15245, _gloffset_CopyTexSubImage3D },
+   { 16925, _gloffset_CopyTexImage2D },
+   { 24874, _gloffset_CopyTexImage1D },
+   { 27686, _gloffset_CopyTexSubImage2D },
+   { 30106, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9505, _gloffset_DrawRangeElements },
+   {  9566, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   856, _gloffset_Histogram },
    {  3522, _gloffset_ResetHistogram },
-   { 10002, _gloffset_GetMinmax },
-   { 15482, _gloffset_GetHistogramParameterfv },
-   { 24541, _gloffset_GetMinmaxParameteriv },
-   { 26725, _gloffset_ResetMinmax },
-   { 27589, _gloffset_GetHistogramParameteriv },
-   { 28758, _gloffset_GetHistogram },
-   { 31347, _gloffset_Minmax },
-   { 32893, _gloffset_GetMinmaxParameterfv },
+   { 10063, _gloffset_GetMinmax },
+   { 15579, _gloffset_GetHistogramParameterfv },
+   { 24799, _gloffset_GetMinmaxParameteriv },
+   { 27038, _gloffset_ResetMinmax },
+   { 27902, _gloffset_GetHistogramParameteriv },
+   { 29071, _gloffset_GetHistogram },
+   { 31695, _gloffset_Minmax },
+   { 33241, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  8368, _gloffset_ColorTable },
-   { 15328, _gloffset_GetColorTable },
-   { 23060, _gloffset_GetColorTableParameterfv },
-   { 25187, _gloffset_GetColorTableParameteriv },
+   {  8429, _gloffset_ColorTable },
+   { 15425, _gloffset_GetColorTable },
+   { 23318, _gloffset_GetColorTableParameterfv },
+   { 25490, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7089, _gloffset_TexSubImage1D },
-   { 10679, _gloffset_TexSubImage2D },
+   {  7174, _gloffset_TexSubImage1D },
+   { 10740, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1774, _gloffset_TexImage3D },
-   { 22829, _gloffset_TexSubImage3D },
+   { 23087, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  3290, _gloffset_PrioritizeTextures },
-   {  7538, _gloffset_AreTexturesResident },
-   { 13612, _gloffset_GenTextures },
-   { 15814, _gloffset_DeleteTextures },
-   { 19647, _gloffset_IsTexture },
-   { 29828, _gloffset_BindTexture },
+   {  7623, _gloffset_AreTexturesResident },
+   { 13694, _gloffset_GenTextures },
+   { 15911, _gloffset_DeleteTextures },
+   { 19859, _gloffset_IsTexture },
+   { 30171, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 24317, _gloffset_ArrayElement },
-   { 30935, _gloffset_GetPointerv },
-   { 32520, _gloffset_DrawArrays },
+   { 24575, _gloffset_ArrayElement },
+   { 31283, _gloffset_GetPointerv },
+   { 32868, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  7656, _gloffset_ColorTableParameteriv },
-   {  8368, _gloffset_ColorTable },
-   { 15328, _gloffset_GetColorTable },
-   { 15438, _gloffset_CopyColorTable },
-   { 19508, _gloffset_ColorTableParameterfv },
-   { 23060, _gloffset_GetColorTableParameterfv },
-   { 25187, _gloffset_GetColorTableParameteriv },
+   {  7741, _gloffset_ColorTableParameteriv },
+   {  8429, _gloffset_ColorTable },
+   { 15425, _gloffset_GetColorTable },
+   { 15535, _gloffset_CopyColorTable },
+   { 19720, _gloffset_ColorTableParameterfv },
+   { 23318, _gloffset_GetColorTableParameterfv },
+   { 25490, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   425, _gloffset_MultiTexCoord3sARB },
    {   657, _gloffset_ActiveTextureARB },
-   {  4247, _gloffset_MultiTexCoord1fvARB },
-   {  6155, _gloffset_MultiTexCoord3dARB },
-   {  6200, _gloffset_MultiTexCoord2iARB },
-   {  6324, _gloffset_MultiTexCoord2svARB },
-   {  8324, _gloffset_MultiTexCoord2fARB },
-   { 10384, _gloffset_MultiTexCoord3fvARB },
-   { 10986, _gloffset_MultiTexCoord4sARB },
-   { 11667, _gloffset_MultiTexCoord2dvARB },
-   { 12082, _gloffset_MultiTexCoord1svARB },
-   { 12454, _gloffset_MultiTexCoord3svARB },
-   { 12515, _gloffset_MultiTexCoord4iARB },
-   { 13316, _gloffset_MultiTexCoord3iARB },
-   { 14186, _gloffset_MultiTexCoord1dARB },
-   { 14403, _gloffset_MultiTexCoord3dvARB },
-   { 15682, _gloffset_MultiTexCoord3ivARB },
-   { 15727, _gloffset_MultiTexCoord2sARB },
-   { 17145, _gloffset_MultiTexCoord4ivARB },
-   { 19158, _gloffset_ClientActiveTextureARB },
-   { 21458, _gloffset_MultiTexCoord2dARB },
-   { 21895, _gloffset_MultiTexCoord4dvARB },
-   { 22251, _gloffset_MultiTexCoord4fvARB },
-   { 23201, _gloffset_MultiTexCoord3fARB },
-   { 25771, _gloffset_MultiTexCoord4dARB },
-   { 26037, _gloffset_MultiTexCoord1sARB },
-   { 26241, _gloffset_MultiTexCoord1dvARB },
-   { 27217, _gloffset_MultiTexCoord1ivARB },
-   { 27310, _gloffset_MultiTexCoord2ivARB },
-   { 27649, _gloffset_MultiTexCoord1iARB },
-   { 29033, _gloffset_MultiTexCoord4svARB },
-   { 29627, _gloffset_MultiTexCoord1fARB },
-   { 29890, _gloffset_MultiTexCoord4fARB },
-   { 32354, _gloffset_MultiTexCoord2fvARB },
+   {  4268, _gloffset_MultiTexCoord1fvARB },
+   {  6240, _gloffset_MultiTexCoord3dARB },
+   {  6285, _gloffset_MultiTexCoord2iARB },
+   {  6409, _gloffset_MultiTexCoord2svARB },
+   {  8385, _gloffset_MultiTexCoord2fARB },
+   { 10445, _gloffset_MultiTexCoord3fvARB },
+   { 11047, _gloffset_MultiTexCoord4sARB },
+   { 11728, _gloffset_MultiTexCoord2dvARB },
+   { 12135, _gloffset_MultiTexCoord1svARB },
+   { 12536, _gloffset_MultiTexCoord3svARB },
+   { 12597, _gloffset_MultiTexCoord4iARB },
+   { 13398, _gloffset_MultiTexCoord3iARB },
+   { 14268, _gloffset_MultiTexCoord1dARB },
+   { 14500, _gloffset_MultiTexCoord3dvARB },
+   { 15779, _gloffset_MultiTexCoord3ivARB },
+   { 15824, _gloffset_MultiTexCoord2sARB },
+   { 17295, _gloffset_MultiTexCoord4ivARB },
+   { 19360, _gloffset_ClientActiveTextureARB },
+   { 21688, _gloffset_MultiTexCoord2dARB },
+   { 22125, _gloffset_MultiTexCoord4dvARB },
+   { 22481, _gloffset_MultiTexCoord4fvARB },
+   { 23459, _gloffset_MultiTexCoord3fARB },
+   { 26084, _gloffset_MultiTexCoord4dARB },
+   { 26350, _gloffset_MultiTexCoord1sARB },
+   { 26554, _gloffset_MultiTexCoord1dvARB },
+   { 27530, _gloffset_MultiTexCoord1ivARB },
+   { 27623, _gloffset_MultiTexCoord2ivARB },
+   { 27962, _gloffset_MultiTexCoord1iARB },
+   { 29346, _gloffset_MultiTexCoord4svARB },
+   { 29970, _gloffset_MultiTexCoord1fARB },
+   { 30233, _gloffset_MultiTexCoord4fARB },
+   { 32702, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5394,7 +5464,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  9226, -1 }, /* TbufferMask3DFX */
+   {  9287, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5486,7 +5556,7 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 12418, -1 }, /* FramebufferTextureLayer */
+   { 12500, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5508,10 +5578,10 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
    {  3773, -1 }, /* MatrixIndexusvARB */
-   { 13137, -1 }, /* MatrixIndexuivARB */
-   { 14558, -1 }, /* MatrixIndexPointerARB */
-   { 19896, -1 }, /* CurrentPaletteMatrixARB */
-   { 22945, -1 }, /* MatrixIndexubvARB */
+   { 13219, -1 }, /* MatrixIndexuivARB */
+   { 14655, -1 }, /* MatrixIndexPointerARB */
+   { 20126, -1 }, /* CurrentPaletteMatrixARB */
+   { 23203, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5544,6 +5614,13 @@ static const struct gl_function_remap GL_ARB_provoking_vertex_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_sampler_objects)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_sampler_objects_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_ARB_shader_objects)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_shader_objects_functions[] = {
@@ -5596,15 +5673,15 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2396, -1 }, /* WeightubvARB */
-   {  6567, -1 }, /* WeightivARB */
-   { 11089, -1 }, /* WeightPointerARB */
-   { 13904, -1 }, /* WeightfvARB */
-   { 17664, -1 }, /* WeightbvARB */
-   { 21126, -1 }, /* WeightusvARB */
-   { 24071, -1 }, /* VertexBlendARB */
-   { 29711, -1 }, /* WeightsvARB */
-   { 31811, -1 }, /* WeightdvARB */
-   { 32554, -1 }, /* WeightuivARB */
+   {  6652, -1 }, /* WeightivARB */
+   { 11150, -1 }, /* WeightPointerARB */
+   { 13986, -1 }, /* WeightfvARB */
+   { 17814, -1 }, /* WeightbvARB */
+   { 21356, -1 }, /* WeightusvARB */
+   { 24329, -1 }, /* VertexBlendARB */
+   { 30054, -1 }, /* WeightsvARB */
+   { 32159, -1 }, /* WeightdvARB */
+   { 32902, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5695,15 +5772,15 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   { 11224, _gloffset_BlendEquation },
+   { 11285, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 17088, _gloffset_ColorSubTable },
-   { 31761, _gloffset_CopyColorSubTable },
+   { 17238, _gloffset_ColorSubTable },
+   { 32109, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5720,63 +5797,63 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {   257, _gloffset_ConvolutionFilter1D },
    {  2454, _gloffset_CopyConvolutionFilter1D },
    {  4058, _gloffset_GetConvolutionParameteriv },
-   {  8506, _gloffset_ConvolutionFilter2D },
-   {  8708, _gloffset_ConvolutionParameteriv },
-   {  9168, _gloffset_ConvolutionParameterfv },
-   { 20662, _gloffset_GetSeparableFilter },
-   { 24145, _gloffset_SeparableFilter2D },
-   { 25008, _gloffset_ConvolutionParameteri },
-   { 25131, _gloffset_ConvolutionParameterf },
-   { 26835, _gloffset_GetConvolutionParameterfv },
-   { 27692, _gloffset_GetConvolutionFilter },
-   { 30125, _gloffset_CopyConvolutionFilter2D },
+   {  8567, _gloffset_ConvolutionFilter2D },
+   {  8769, _gloffset_ConvolutionParameteriv },
+   {  9229, _gloffset_ConvolutionParameterfv },
+   { 20892, _gloffset_GetSeparableFilter },
+   { 24403, _gloffset_SeparableFilter2D },
+   { 25266, _gloffset_ConvolutionParameteri },
+   { 25434, _gloffset_ConvolutionParameterf },
+   { 27148, _gloffset_GetConvolutionParameterfv },
+   { 28005, _gloffset_GetConvolutionFilter },
+   { 30468, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10523, -1 }, /* TangentPointerEXT */
-   { 12573, -1 }, /* Binormal3ivEXT */
-   { 13269, -1 }, /* Tangent3sEXT */
-   { 14623, -1 }, /* Tangent3fvEXT */
-   { 18856, -1 }, /* Tangent3dvEXT */
-   { 19594, -1 }, /* Binormal3bvEXT */
-   { 20715, -1 }, /* Binormal3dEXT */
-   { 22877, -1 }, /* Tangent3fEXT */
-   { 25080, -1 }, /* Binormal3sEXT */
-   { 25548, -1 }, /* Tangent3ivEXT */
-   { 25567, -1 }, /* Tangent3dEXT */
-   { 26514, -1 }, /* Binormal3svEXT */
-   { 27115, -1 }, /* Binormal3fEXT */
-   { 28023, -1 }, /* Binormal3dvEXT */
-   { 29290, -1 }, /* Tangent3iEXT */
-   { 30410, -1 }, /* Tangent3bvEXT */
-   { 30970, -1 }, /* Tangent3bEXT */
-   { 31534, -1 }, /* Binormal3fvEXT */
-   { 32253, -1 }, /* BinormalPointerEXT */
-   { 32658, -1 }, /* Tangent3svEXT */
-   { 33095, -1 }, /* Binormal3bEXT */
-   { 33272, -1 }, /* Binormal3iEXT */
+   { 10584, -1 }, /* TangentPointerEXT */
+   { 12655, -1 }, /* Binormal3ivEXT */
+   { 13351, -1 }, /* Tangent3sEXT */
+   { 14720, -1 }, /* Tangent3fvEXT */
+   { 18831, -1 }, /* Tangent3ivEXT */
+   { 19058, -1 }, /* Tangent3dvEXT */
+   { 19806, -1 }, /* Binormal3bvEXT */
+   { 20945, -1 }, /* Binormal3dEXT */
+   { 23135, -1 }, /* Tangent3fEXT */
+   { 25338, -1 }, /* Binormal3sEXT */
+   { 25880, -1 }, /* Tangent3dEXT */
+   { 26827, -1 }, /* Binormal3svEXT */
+   { 27428, -1 }, /* Binormal3fEXT */
+   { 28336, -1 }, /* Binormal3dvEXT */
+   { 29603, -1 }, /* Tangent3iEXT */
+   { 30753, -1 }, /* Tangent3bvEXT */
+   { 31318, -1 }, /* Tangent3bEXT */
+   { 31882, -1 }, /* Binormal3fvEXT */
+   { 32601, -1 }, /* BinormalPointerEXT */
+   { 33006, -1 }, /* Tangent3svEXT */
+   { 33443, -1 }, /* Binormal3bEXT */
+   { 33620, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 15148, _gloffset_CopyTexSubImage3D },
-   { 16775, _gloffset_CopyTexImage2D },
-   { 24616, _gloffset_CopyTexImage1D },
-   { 27373, _gloffset_CopyTexSubImage2D },
-   { 29763, _gloffset_CopyTexSubImage1D },
+   { 15245, _gloffset_CopyTexSubImage3D },
+   { 16925, _gloffset_CopyTexImage2D },
+   { 24874, _gloffset_CopyTexImage1D },
+   { 27686, _gloffset_CopyTexSubImage2D },
+   { 30106, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  8857, -1 }, /* CullParameterdvEXT */
-   { 11712, -1 }, /* CullParameterfvEXT */
+   {  8918, -1 }, /* CullParameterdvEXT */
+   { 11773, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5804,7 +5881,7 @@ static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
 
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  9505, _gloffset_DrawRangeElements },
+   {  9566, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5855,37 +5932,37 @@ static const struct gl_function_remap GL_EXT_gpu_shader4_functions[] = {
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   856, _gloffset_Histogram },
    {  3522, _gloffset_ResetHistogram },
-   { 10002, _gloffset_GetMinmax },
-   { 15482, _gloffset_GetHistogramParameterfv },
-   { 24541, _gloffset_GetMinmaxParameteriv },
-   { 26725, _gloffset_ResetMinmax },
-   { 27589, _gloffset_GetHistogramParameteriv },
-   { 28758, _gloffset_GetHistogram },
-   { 31347, _gloffset_Minmax },
-   { 32893, _gloffset_GetMinmaxParameterfv },
+   { 10063, _gloffset_GetMinmax },
+   { 15579, _gloffset_GetHistogramParameterfv },
+   { 24799, _gloffset_GetMinmaxParameteriv },
+   { 27038, _gloffset_ResetMinmax },
+   { 27902, _gloffset_GetHistogramParameteriv },
+   { 29071, _gloffset_GetHistogram },
+   { 31695, _gloffset_Minmax },
+   { 33241, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 11498, -1 }, /* IndexFuncEXT */
+   { 11559, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 21213, -1 }, /* IndexMaterialEXT */
+   { 21443, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 26534, -1 }, /* ApplyTextureEXT */
-   { 26679, -1 }, /* TextureMaterialEXT */
-   { 26704, -1 }, /* TextureLightEXT */
+   { 26847, -1 }, /* ApplyTextureEXT */
+   { 26992, -1 }, /* TextureMaterialEXT */
+   { 27017, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5906,20 +5983,20 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  8368, _gloffset_ColorTable },
-   { 15328, _gloffset_GetColorTable },
-   { 23060, _gloffset_GetColorTableParameterfv },
-   { 25187, _gloffset_GetColorTableParameteriv },
+   {  8429, _gloffset_ColorTable },
+   { 15425, _gloffset_GetColorTable },
+   { 23318, _gloffset_GetColorTableParameterfv },
+   { 25490, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 21860, -1 }, /* PixelTransformParameterfEXT */
-   { 21940, -1 }, /* PixelTransformParameteriEXT */
-   { 30685, -1 }, /* PixelTransformParameterfvEXT */
-   { 32217, -1 }, /* PixelTransformParameterivEXT */
+   { 22090, -1 }, /* PixelTransformParameterfEXT */
+   { 22170, -1 }, /* PixelTransformParameteriEXT */
+   { 31033, -1 }, /* PixelTransformParameterfvEXT */
+   { 32565, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5968,8 +6045,8 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  7089, _gloffset_TexSubImage1D },
-   { 10679, _gloffset_TexSubImage2D },
+   {  7174, _gloffset_TexSubImage1D },
+   { 10740, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
@@ -5977,7 +6054,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1774, _gloffset_TexImage3D },
-   { 22829, _gloffset_TexSubImage3D },
+   { 23087, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5999,18 +6076,18 @@ static const struct gl_function_remap GL_EXT_texture_integer_functions[] = {
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
    {  3290, _gloffset_PrioritizeTextures },
-   {  7538, _gloffset_AreTexturesResident },
-   { 13612, _gloffset_GenTextures },
-   { 15814, _gloffset_DeleteTextures },
-   { 19647, _gloffset_IsTexture },
-   { 29828, _gloffset_BindTexture },
+   {  7623, _gloffset_AreTexturesResident },
+   { 13694, _gloffset_GenTextures },
+   { 15911, _gloffset_DeleteTextures },
+   { 19859, _gloffset_IsTexture },
+   { 30171, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 13854, -1 }, /* TextureNormalEXT */
+   { 13936, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -6032,18 +6109,18 @@ static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 24317, _gloffset_ArrayElement },
-   { 30935, _gloffset_GetPointerv },
-   { 32520, _gloffset_DrawArrays },
+   { 24575, _gloffset_ArrayElement },
+   { 31283, _gloffset_GetPointerv },
+   { 32868, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 19677, -1 }, /* VertexWeightfvEXT */
-   { 27058, -1 }, /* VertexWeightfEXT */
-   { 28727, -1 }, /* VertexWeightPointerEXT */
+   { 19907, -1 }, /* VertexWeightfvEXT */
+   { 27371, -1 }, /* VertexWeightfEXT */
+   { 29040, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -6052,10 +6129,10 @@ static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  2327, -1 }, /* GetImageTransformParameterfvHP */
    {  3739, -1 }, /* ImageTransformParameterfHP */
-   { 10217, -1 }, /* ImageTransformParameterfvHP */
-   { 11967, -1 }, /* ImageTransformParameteriHP */
-   { 12308, -1 }, /* GetImageTransformParameterivHP */
-   { 19741, -1 }, /* ImageTransformParameterivHP */
+   { 10278, -1 }, /* ImageTransformParameterfvHP */
+   { 12020, -1 }, /* ImageTransformParameteriHP */
+   { 12390, -1 }, /* GetImageTransformParameterivHP */
+   { 19971, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -6069,14 +6146,14 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
-   {  4379, -1 }, /* SecondaryColorPointerListIBM */
-   {  6021, -1 }, /* NormalPointerListIBM */
-   {  7712, -1 }, /* FogCoordPointerListIBM */
-   {  8019, -1 }, /* VertexPointerListIBM */
-   { 11888, -1 }, /* ColorPointerListIBM */
-   { 13376, -1 }, /* TexCoordPointerListIBM */
-   { 13876, -1 }, /* IndexPointerListIBM */
-   { 32836, -1 }, /* EdgeFlagPointerListIBM */
+   {  4400, -1 }, /* SecondaryColorPointerListIBM */
+   {  6106, -1 }, /* NormalPointerListIBM */
+   {  7797, -1 }, /* FogCoordPointerListIBM */
+   {  8104, -1 }, /* VertexPointerListIBM */
+   { 12274, -1 }, /* ColorPointerListIBM */
+   { 13458, -1 }, /* TexCoordPointerListIBM */
+   { 13958, -1 }, /* IndexPointerListIBM */
+   { 33184, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -6090,10 +6167,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 12716, -1 }, /* VertexPointervINTEL */
-   { 15575, -1 }, /* ColorPointervINTEL */
-   { 30099, -1 }, /* NormalPointervINTEL */
-   { 30617, -1 }, /* TexCoordPointervINTEL */
+   { 12798, -1 }, /* VertexPointervINTEL */
+   { 15672, -1 }, /* ColorPointervINTEL */
+   { 30442, -1 }, /* NormalPointervINTEL */
+   { 30965, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -6109,8 +6186,8 @@ static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
 static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1638, -1 }, /* GetDebugLogLengthMESA */
    {  3461, -1 }, /* ClearDebugLogMESA */
-   {  4540, -1 }, /* GetDebugLogMESA */
-   { 31128, -1 }, /* CreateDebugObjectMESA */
+   {  4561, -1 }, /* GetDebugLogMESA */
+   { 31476, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -6131,15 +6208,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  6751, -1 }, /* GetMapAttribParameterivNV */
-   {  8474, -1 }, /* MapControlPointsNV */
-   {  8573, -1 }, /* MapParameterfvNV */
-   { 10662, -1 }, /* EvalMapsNV */
-   { 17262, -1 }, /* GetMapAttribParameterfvNV */
-   { 17479, -1 }, /* MapParameterivNV */
-   { 24931, -1 }, /* GetMapParameterivNV */
-   { 25429, -1 }, /* GetMapParameterfvNV */
-   { 29414, -1 }, /* GetMapControlPointsNV */
+   {  6836, -1 }, /* GetMapAttribParameterivNV */
+   {  8535, -1 }, /* MapControlPointsNV */
+   {  8634, -1 }, /* MapParameterfvNV */
+   { 10723, -1 }, /* EvalMapsNV */
+   { 17412, -1 }, /* GetMapAttribParameterfvNV */
+   { 17629, -1 }, /* MapParameterivNV */
+   { 25189, -1 }, /* GetMapParameterivNV */
+   { 25732, -1 }, /* GetMapParameterfvNV */
+   { 29757, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -6181,8 +6258,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 15967, -1 }, /* CombinerStageParameterfvNV */
-   { 16363, -1 }, /* GetCombinerStageParameterfvNV */
+   { 16064, -1 }, /* CombinerStageParameterfvNV */
+   { 16460, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6217,23 +6294,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  8694, -1 }, /* HintPGI */
+   {  8755, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 16336, -1 }, /* GetDetailTexFuncSGIS */
-   { 16720, -1 }, /* DetailTexFuncSGIS */
+   { 16433, -1 }, /* GetDetailTexFuncSGIS */
+   { 16870, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 27355, -1 }, /* FogFuncSGIS */
-   { 28076, -1 }, /* GetFogFuncSGIS */
+   { 27668, -1 }, /* FogFuncSGIS */
+   { 28389, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6261,8 +6338,8 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  6812, -1 }, /* GetSharpenTexFuncSGIS */
-   { 22225, -1 }, /* SharpenTexFuncSGIS */
+   {  6897, -1 }, /* GetSharpenTexFuncSGIS */
+   { 22455, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6270,22 +6347,22 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {  1010, -1 }, /* TexImage4DSGIS */
-   { 15883, -1 }, /* TexSubImage4DSGIS */
+   { 15980, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 15281, -1 }, /* TextureColorMaskSGIS */
+   { 15378, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6989, -1 }, /* GetTexFilterFuncSGIS */
-   { 16482, -1 }, /* TexFilterFuncSGIS */
+   {  7074, -1 }, /* GetTexFilterFuncSGIS */
+   { 16606, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6293,18 +6370,18 @@ static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
    {  3387, -1 }, /* AsyncMarkerSGIX */
-   {  4519, -1 }, /* FinishAsyncSGIX */
-   {  5466, -1 }, /* PollAsyncSGIX */
-   { 22406, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 22461, -1 }, /* IsAsyncMarkerSGIX */
-   { 32633, -1 }, /* GenAsyncMarkersSGIX */
+   {  4540, -1 }, /* FinishAsyncSGIX */
+   {  5516, -1 }, /* PollAsyncSGIX */
+   { 22664, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 22719, -1 }, /* IsAsyncMarkerSGIX */
+   { 32981, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  7366, -1 }, /* FlushRasterSGIX */
+   {  7451, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6312,37 +6389,37 @@ static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  2625, -1 }, /* FragmentMaterialfvSGIX */
-   {  5370, -1 }, /* FragmentLightiSGIX */
-   {  8086, -1 }, /* FragmentMaterialfSGIX */
-   {  8247, -1 }, /* GetFragmentLightivSGIX */
-   {  9120, -1 }, /* FragmentLightModeliSGIX */
-   { 10725, -1 }, /* FragmentLightivSGIX */
-   { 11032, -1 }, /* GetFragmentMaterialivSGIX */
-   { 16276, -1 }, /* GetFragmentMaterialfvSGIX */
-   { 19564, -1 }, /* FragmentLightModelfSGIX */
-   { 19864, -1 }, /* FragmentColorMaterialSGIX */
-   { 20281, -1 }, /* FragmentMaterialiSGIX */
-   { 21541, -1 }, /* LightEnviSGIX */
-   { 23152, -1 }, /* FragmentLightModelfvSGIX */
-   { 23487, -1 }, /* FragmentLightfvSGIX */
-   { 28460, -1 }, /* FragmentLightModelivSGIX */
-   { 28609, -1 }, /* FragmentLightfSGIX */
-   { 31504, -1 }, /* GetFragmentLightfvSGIX */
-   { 33116, -1 }, /* FragmentMaterialivSGIX */
+   {  5420, -1 }, /* FragmentLightiSGIX */
+   {  8171, -1 }, /* FragmentMaterialfSGIX */
+   {  8308, -1 }, /* GetFragmentLightivSGIX */
+   {  9181, -1 }, /* FragmentLightModeliSGIX */
+   { 10786, -1 }, /* FragmentLightivSGIX */
+   { 11093, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16373, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 19776, -1 }, /* FragmentLightModelfSGIX */
+   { 20094, -1 }, /* FragmentColorMaterialSGIX */
+   { 20511, -1 }, /* FragmentMaterialiSGIX */
+   { 21771, -1 }, /* LightEnviSGIX */
+   { 23410, -1 }, /* FragmentLightModelfvSGIX */
+   { 23745, -1 }, /* FragmentLightfvSGIX */
+   { 28773, -1 }, /* FragmentLightModelivSGIX */
+   { 28922, -1 }, /* FragmentLightfSGIX */
+   { 31852, -1 }, /* GetFragmentLightfvSGIX */
+   { 33464, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 22484, -1 }, /* FrameZoomSGIX */
+   { 22742, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 28917, -1 }, /* IglooInterfaceSGIX */
+   { 29230, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6350,11 +6427,11 @@ static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2805, -1 }, /* ReadInstrumentsSGIX */
-   {  6585, -1 }, /* PollInstrumentsSGIX */
-   { 10583, -1 }, /* GetInstrumentsSGIX */
-   { 12974, -1 }, /* StartInstrumentsSGIX */
-   { 16001, -1 }, /* StopInstrumentsSGIX */
-   { 17901, -1 }, /* InstrumentsBufferSGIX */
+   {  6670, -1 }, /* PollInstrumentsSGIX */
+   { 10644, -1 }, /* GetInstrumentsSGIX */
+   { 13056, -1 }, /* StartInstrumentsSGIX */
+   { 16098, -1 }, /* StopInstrumentsSGIX */
+   { 18051, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6363,10 +6440,10 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1241, -1 }, /* ListParameterfSGIX */
    {  3089, -1 }, /* GetListParameterfvSGIX */
-   { 17792, -1 }, /* ListParameteriSGIX */
-   { 18806, -1 }, /* ListParameterfvSGIX */
-   { 20947, -1 }, /* ListParameterivSGIX */
-   { 32677, -1 }, /* GetListParameterivSGIX */
+   { 17942, -1 }, /* ListParameteriSGIX */
+   { 19008, -1 }, /* ListParameterfvSGIX */
+   { 21177, -1 }, /* ListParameterivSGIX */
+   { 33025, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6381,53 +6458,53 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
    {  3685, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 16101, -1 }, /* DeformSGIX */
-   { 24429, -1 }, /* DeformationMap3fSGIX */
-   { 31392, -1 }, /* DeformationMap3dSGIX */
+   { 16198, -1 }, /* DeformSGIX */
+   { 24687, -1 }, /* DeformationMap3fSGIX */
+   { 31740, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 14832, -1 }, /* ReferencePlaneSGIX */
+   { 14929, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9618, -1 }, /* SpriteParameterfvSGIX */
-   { 20736, -1 }, /* SpriteParameteriSGIX */
-   { 26759, -1 }, /* SpriteParameterfSGIX */
-   { 29557, -1 }, /* SpriteParameterivSGIX */
+   {  9679, -1 }, /* SpriteParameterfvSGIX */
+   { 20966, -1 }, /* SpriteParameteriSGIX */
+   { 27072, -1 }, /* SpriteParameterfSGIX */
+   { 29900, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 20795, -1 }, /* TagSampleBufferSGIX */
+   { 21025, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  7656, _gloffset_ColorTableParameteriv },
-   {  8368, _gloffset_ColorTable },
-   { 15328, _gloffset_GetColorTable },
-   { 15438, _gloffset_CopyColorTable },
-   { 19508, _gloffset_ColorTableParameterfv },
-   { 23060, _gloffset_GetColorTableParameterfv },
-   { 25187, _gloffset_GetColorTableParameteriv },
+   {  7741, _gloffset_ColorTableParameteriv },
+   {  8429, _gloffset_ColorTable },
+   { 15425, _gloffset_GetColorTable },
+   { 15535, _gloffset_CopyColorTable },
+   { 19720, _gloffset_ColorTableParameterfv },
+   { 23318, _gloffset_GetColorTableParameterfv },
+   { 25490, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 31482, -1 }, /* FinishTextureSUNX */
+   { 31830, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
@@ -6435,33 +6512,33 @@ static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
    {  3408, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4818, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6610, -1 }, /* GlobalAlphaFactordSUN */
-   {  9702, -1 }, /* GlobalAlphaFactoruiSUN */
-   { 10174, -1 }, /* GlobalAlphaFactorbSUN */
-   { 13289, -1 }, /* GlobalAlphaFactorfSUN */
-   { 13453, -1 }, /* GlobalAlphaFactorusSUN */
-   { 22747, -1 }, /* GlobalAlphaFactorsSUN */
+   {  4868, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6695, -1 }, /* GlobalAlphaFactordSUN */
+   {  9763, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10235, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13371, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13535, -1 }, /* GlobalAlphaFactorusSUN */
+   { 23005, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 29348, -1 }, /* DrawMeshArraysSUN */
+   { 29691, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4493, -1 }, /* ReplacementCodeubSUN */
-   {  6369, -1 }, /* ReplacementCodeubvSUN */
-   { 19229, -1 }, /* ReplacementCodeusvSUN */
-   { 19417, -1 }, /* ReplacementCodePointerSUN */
-   { 21605, -1 }, /* ReplacementCodeuiSUN */
-   { 22435, -1 }, /* ReplacementCodeusSUN */
-   { 30014, -1 }, /* ReplacementCodeuivSUN */
+   {  4514, -1 }, /* ReplacementCodeubSUN */
+   {  6454, -1 }, /* ReplacementCodeubvSUN */
+   { 19441, -1 }, /* ReplacementCodeusvSUN */
+   { 19629, -1 }, /* ReplacementCodePointerSUN */
+   { 21835, -1 }, /* ReplacementCodeuiSUN */
+   { 22693, -1 }, /* ReplacementCodeusSUN */
+   { 30357, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -6475,39 +6552,39 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  2003, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
    {  2561, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
    {  2874, -1 }, /* Color4ubVertex3fvSUN */
-   {  4652, -1 }, /* Color4ubVertex3fSUN */
-   {  4775, -1 }, /* TexCoord2fVertex3fSUN */
-   {  5119, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5570, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  6264, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  7044, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7403, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  8115, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8919, -1 }, /* Color3fVertex3fSUN */
-   { 10110, -1 }, /* Color3fVertex3fvSUN */
-   { 10548, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 11377, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 12837, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 14448, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 14974, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 16026, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 16441, -1 }, /* Color4ubVertex2fvSUN */
-   { 16745, -1 }, /* Normal3fVertex3fSUN */
-   { 17842, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 18203, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 19058, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 19834, -1 }, /* Color4ubVertex2fSUN */
-   { 20072, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 22071, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 22503, -1 }, /* Normal3fVertex3fvSUN */
-   { 22969, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 23978, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 26080, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 27471, -1 }, /* TexCoord4fVertex4fSUN */
-   { 27917, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 28304, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 28431, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 29165, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  4673, -1 }, /* Color4ubVertex3fSUN */
+   {  4796, -1 }, /* TexCoord2fVertex3fSUN */
+   {  5169, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  5620, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  6349, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  7129, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7488, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  8980, -1 }, /* Color3fVertex3fSUN */
+   { 10171, -1 }, /* Color3fVertex3fvSUN */
+   { 10609, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11438, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 12919, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14545, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 15071, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 16123, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16565, -1 }, /* Color4ubVertex2fvSUN */
+   { 16895, -1 }, /* Normal3fVertex3fSUN */
+   { 17992, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18344, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 18651, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   { 19260, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 20064, -1 }, /* Color4ubVertex2fSUN */
+   { 20302, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 22301, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 22761, -1 }, /* Normal3fVertex3fvSUN */
+   { 23227, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 24236, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 26393, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 27784, -1 }, /* TexCoord4fVertex4fSUN */
+   { 28230, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 28617, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 28744, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 29478, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6517,38 +6594,38 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
 static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {   425, _gloffset_MultiTexCoord3sARB },
    {   657, _gloffset_ActiveTextureARB },
-   {  4247, _gloffset_MultiTexCoord1fvARB },
-   {  6155, _gloffset_MultiTexCoord3dARB },
-   {  6200, _gloffset_MultiTexCoord2iARB },
-   {  6324, _gloffset_MultiTexCoord2svARB },
-   {  8324, _gloffset_MultiTexCoord2fARB },
-   { 10384, _gloffset_MultiTexCoord3fvARB },
-   { 10986, _gloffset_MultiTexCoord4sARB },
-   { 11667, _gloffset_MultiTexCoord2dvARB },
-   { 12082, _gloffset_MultiTexCoord1svARB },
-   { 12454, _gloffset_MultiTexCoord3svARB },
-   { 12515, _gloffset_MultiTexCoord4iARB },
-   { 13316, _gloffset_MultiTexCoord3iARB },
-   { 14186, _gloffset_MultiTexCoord1dARB },
-   { 14403, _gloffset_MultiTexCoord3dvARB },
-   { 15682, _gloffset_MultiTexCoord3ivARB },
-   { 15727, _gloffset_MultiTexCoord2sARB },
-   { 17145, _gloffset_MultiTexCoord4ivARB },
-   { 19158, _gloffset_ClientActiveTextureARB },
-   { 21458, _gloffset_MultiTexCoord2dARB },
-   { 21895, _gloffset_MultiTexCoord4dvARB },
-   { 22251, _gloffset_MultiTexCoord4fvARB },
-   { 23201, _gloffset_MultiTexCoord3fARB },
-   { 25771, _gloffset_MultiTexCoord4dARB },
-   { 26037, _gloffset_MultiTexCoord1sARB },
-   { 26241, _gloffset_MultiTexCoord1dvARB },
-   { 27217, _gloffset_MultiTexCoord1ivARB },
-   { 27310, _gloffset_MultiTexCoord2ivARB },
-   { 27649, _gloffset_MultiTexCoord1iARB },
-   { 29033, _gloffset_MultiTexCoord4svARB },
-   { 29627, _gloffset_MultiTexCoord1fARB },
-   { 29890, _gloffset_MultiTexCoord4fARB },
-   { 32354, _gloffset_MultiTexCoord2fvARB },
+   {  4268, _gloffset_MultiTexCoord1fvARB },
+   {  6240, _gloffset_MultiTexCoord3dARB },
+   {  6285, _gloffset_MultiTexCoord2iARB },
+   {  6409, _gloffset_MultiTexCoord2svARB },
+   {  8385, _gloffset_MultiTexCoord2fARB },
+   { 10445, _gloffset_MultiTexCoord3fvARB },
+   { 11047, _gloffset_MultiTexCoord4sARB },
+   { 11728, _gloffset_MultiTexCoord2dvARB },
+   { 12135, _gloffset_MultiTexCoord1svARB },
+   { 12536, _gloffset_MultiTexCoord3svARB },
+   { 12597, _gloffset_MultiTexCoord4iARB },
+   { 13398, _gloffset_MultiTexCoord3iARB },
+   { 14268, _gloffset_MultiTexCoord1dARB },
+   { 14500, _gloffset_MultiTexCoord3dvARB },
+   { 15779, _gloffset_MultiTexCoord3ivARB },
+   { 15824, _gloffset_MultiTexCoord2sARB },
+   { 17295, _gloffset_MultiTexCoord4ivARB },
+   { 19360, _gloffset_ClientActiveTextureARB },
+   { 21688, _gloffset_MultiTexCoord2dARB },
+   { 22125, _gloffset_MultiTexCoord4dvARB },
+   { 22481, _gloffset_MultiTexCoord4fvARB },
+   { 23459, _gloffset_MultiTexCoord3fARB },
+   { 26084, _gloffset_MultiTexCoord4dARB },
+   { 26350, _gloffset_MultiTexCoord1sARB },
+   { 26554, _gloffset_MultiTexCoord1dvARB },
+   { 27530, _gloffset_MultiTexCoord1ivARB },
+   { 27623, _gloffset_MultiTexCoord2ivARB },
+   { 27962, _gloffset_MultiTexCoord1iARB },
+   { 29346, _gloffset_MultiTexCoord4svARB },
+   { 29970, _gloffset_MultiTexCoord1fARB },
+   { 30233, _gloffset_MultiTexCoord4fARB },
+   { 32702, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
new file mode 100644
index 00000000000..55acb6d1f5c
--- /dev/null
+++ b/src/mesa/main/samplerobj.c
@@ -0,0 +1,1355 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2011  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file samplerobj.c
+ * \brief Functions for the GL_ARB_sampler_objects extension.
+ * \author Brian Paul
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/dispatch.h"
+#include "main/enums.h"
+#include "main/hash.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+#include "main/samplerobj.h"
+
+
+static struct gl_sampler_object *
+_mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name)
+{
+   if (name == 0)
+      return NULL;
+   else
+      return (struct gl_sampler_object *)
+         _mesa_HashLookup(ctx->Shared->SamplerObjects, name);
+}
+
+
+/**
+ * Handle reference counting.
+ */
+void
+_mesa_reference_sampler_object(struct gl_context *ctx,
+                               struct gl_sampler_object **ptr,
+                               struct gl_sampler_object *samp)
+{
+   if (*ptr == samp)
+      return;
+
+   if (*ptr) {
+      /* Unreference the old buffer */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_sampler_object *oldSamp = *ptr;
+
+      /*_glthread_LOCK_MUTEX(oldSamp->Mutex);*/
+      ASSERT(oldSamp->RefCount > 0);
+      oldSamp->RefCount--;
+#if 0
+      printf("SamplerObj %p %d DECR to %d\n",
+             (void *) oldSamp, oldSamp->Name, oldSamp->RefCount);
+#endif
+      deleteFlag = (oldSamp->RefCount == 0);
+      /*_glthread_UNLOCK_MUTEX(oldSamp->Mutex);*/
+
+      if (deleteFlag) {
+	 ASSERT(ctx->Driver.DeleteSamplerObject);
+         ctx->Driver.DeleteSamplerObject(ctx, oldSamp);
+      }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (samp) {
+      /* reference new sampler */
+      /*_glthread_LOCK_MUTEX(samp->Mutex);*/
+      if (samp->RefCount == 0) {
+         /* this buffer's being deleted (look just above) */
+         /* Not sure this can every really happen.  Warn if it does. */
+         _mesa_problem(NULL, "referencing deleted buffer object");
+         *ptr = NULL;
+      }
+      else {
+         samp->RefCount++;
+#if 0
+         printf("SamplerObj %p %d INCR to %d\n",
+                (void *) samp, samp->Name, samp->RefCount);
+#endif
+         *ptr = samp;
+      }
+      /*_glthread_UNLOCK_MUTEX(samp->Mutex);*/
+   }
+}
+
+
+/**
+ * Initialize the fields of the given sampler object.
+ */
+void
+_mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name)
+{
+   sampObj->Name = name;
+   sampObj->RefCount = 1;
+   sampObj->WrapS = GL_REPEAT;
+   sampObj->WrapT = GL_REPEAT;
+   sampObj->WrapR = GL_REPEAT;
+   sampObj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
+   sampObj->MagFilter = GL_LINEAR;
+   sampObj->BorderColor.f[0] = 0.0;
+   sampObj->BorderColor.f[1] = 0.0;
+   sampObj->BorderColor.f[2] = 0.0;
+   sampObj->BorderColor.f[3] = 0.0;
+   sampObj->MinLod = -1000.0F;
+   sampObj->MaxLod = 1000.0F;
+   sampObj->LodBias = 0.0F;
+   sampObj->MaxAnisotropy = 1.0F;
+   sampObj->CompareMode = GL_NONE;
+   sampObj->CompareFunc = GL_LEQUAL;
+   sampObj->CompareFailValue = 0.0;
+   sampObj->sRGBDecode = GL_FALSE;
+   sampObj->DepthMode = 0;
+}
+
+
+/**
+ * Fallback for ctx->Driver.NewSamplerObject();
+ */
+struct gl_sampler_object *
+_mesa_new_sampler_object(struct gl_context *ctx, GLuint name)
+{
+   struct gl_sampler_object *sampObj = CALLOC_STRUCT(gl_sampler_object);
+   if (sampObj) {
+      _mesa_init_sampler_object(sampObj, name);
+   }
+   return sampObj;
+}
+
+
+/**
+ * Fallback for ctx->Driver.DeleteSamplerObject();
+ */
+void
+_mesa_delete_sampler_object(struct gl_context *ctx,
+                            struct gl_sampler_object *sampObj)
+{
+   FREE(sampObj);
+}
+
+
+static void GLAPIENTRY
+_mesa_GenSamplers(GLsizei count, GLuint *samplers)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGenSamplers(%d)\n", count);
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenSamplers");
+      return;
+   }
+
+   if (!samplers)
+      return;
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->SamplerObjects, count);
+
+   /* Insert the ID and pointer to new sampler object into hash table */
+   for (i = 0; i < count; i++) {
+      struct gl_sampler_object *sampObj =
+         ctx->Driver.NewSamplerObject(ctx, first + i);
+      _mesa_HashInsert(ctx->Shared->SamplerObjects, first + i, sampObj);
+      samplers[i] = first + i;
+   }
+}
+
+
+static void GLAPIENTRY
+_mesa_DeleteSamplers(GLsizei count, const GLuint *samplers)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLsizei i;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   FLUSH_VERTICES(ctx, 0);
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteSamplers(count)");
+      return;
+   }
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   for (i = 0; i < count; i++) {
+      if (samplers[i]) {
+         struct gl_sampler_object *sampObj =
+            _mesa_lookup_samplerobj(ctx, samplers[i]);
+         if (sampObj) {
+            /* The ID is immediately freed for re-use */
+            _mesa_HashRemove(ctx->Shared->SamplerObjects, samplers[i]);
+            /* But the object exists until its reference count goes to zero */
+            _mesa_reference_sampler_object(ctx, &sampObj, NULL);
+         }
+      }
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+}
+
+
+static GLboolean GLAPIENTRY
+_mesa_IsSampler(GLuint sampler)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (sampler == 0)
+      return GL_FALSE;
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+
+   return sampObj != NULL;
+}
+
+
+static void GLAPIENTRY
+_mesa_BindSampler(GLuint unit, GLuint sampler)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (unit >= ctx->Const.MaxTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindSampler(unit %u)", unit);
+      return;
+   }
+
+   if (sampler == 0) {
+      /* Use the default sampler object, the one contained in the texture
+       * object.
+       */
+      sampObj = NULL;
+   }
+   else {
+      /* user-defined sampler object */
+      sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+      if (!sampObj) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindSampler(sampler)");
+         return;
+      }
+   }
+   
+   if (ctx->Texture.Unit[unit].Sampler != sampObj) {
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+   }
+
+   /* bind new sampler */
+   _mesa_reference_sampler_object(ctx, &ctx->Texture.Unit[unit].Sampler,
+                                  sampObj);
+}
+
+
+/**
+ * Check if a coordinate wrap mode is supported for the texture target.
+ * \return GL_TRUE if legal, GL_FALSE otherwise
+ */
+static GLboolean 
+validate_texture_wrap_mode(struct gl_context *ctx, GLenum wrap)
+{
+   const struct gl_extensions * const e = &ctx->Extensions;
+
+   switch (wrap) {
+   case GL_CLAMP:
+   case GL_CLAMP_TO_EDGE:
+   case GL_REPEAT:
+      return GL_TRUE;
+   case GL_CLAMP_TO_BORDER:
+      return e->ARB_texture_border_clamp;
+   case GL_MIRRORED_REPEAT:
+      return e->ARB_texture_mirrored_repeat;
+   case GL_MIRROR_CLAMP_EXT:
+      return e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp;
+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
+      return e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp;
+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
+      return e->EXT_texture_mirror_clamp;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * This is called just prior to changing any sampler object state.
+ */
+static INLINE void
+flush(struct gl_context *ctx)
+{
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+}
+
+
+#define INVALID_PARAM 0x100
+#define INVALID_PNAME 0x101
+#define INVALID_VALUE 0x102
+
+static GLuint
+set_sampler_wrap_s(struct gl_context *ctx, struct gl_sampler_object *samp,
+                   GLint param)
+{
+   if (samp->WrapS == param)
+      return GL_FALSE;
+   if (validate_texture_wrap_mode(ctx, param)) {
+      flush(ctx);
+      samp->WrapS = param;
+      return GL_TRUE;
+   }
+   return INVALID_PARAM;
+}
+
+
+static GLuint
+set_sampler_wrap_t(struct gl_context *ctx, struct gl_sampler_object *samp,
+                   GLint param)
+{
+   if (samp->WrapT == param)
+      return GL_FALSE;
+   if (validate_texture_wrap_mode(ctx, param)) {
+      flush(ctx);
+      samp->WrapT = param;
+      return GL_TRUE;
+   }
+   return INVALID_PARAM;
+}
+
+
+static GLuint
+set_sampler_wrap_r(struct gl_context *ctx, struct gl_sampler_object *samp,
+                   GLint param)
+{
+   if (samp->WrapR == param)
+      return GL_FALSE;
+   if (validate_texture_wrap_mode(ctx, param)) {
+      flush(ctx);
+      samp->WrapR = param;
+      return GL_TRUE;
+   }
+   return INVALID_PARAM;
+}
+
+
+static GLuint
+set_sampler_min_filter(struct gl_context *ctx, struct gl_sampler_object *samp,
+                       GLint param)
+{
+   if (samp->MinFilter == param)
+      return GL_FALSE;
+
+   switch (param) {
+   case GL_NEAREST:
+   case GL_LINEAR:
+   case GL_NEAREST_MIPMAP_NEAREST:
+   case GL_LINEAR_MIPMAP_NEAREST:
+   case GL_NEAREST_MIPMAP_LINEAR:
+   case GL_LINEAR_MIPMAP_LINEAR:
+      flush(ctx);
+      samp->MinFilter = param;
+      return GL_TRUE;
+   default:
+      return INVALID_PARAM;
+   }
+}
+
+
+static GLuint
+set_sampler_mag_filter(struct gl_context *ctx, struct gl_sampler_object *samp,
+                       GLint param)
+{
+   if (samp->MagFilter == param)
+      return GL_FALSE;
+
+   switch (param) {
+   case GL_NEAREST:
+   case GL_LINEAR:
+      flush(ctx);
+      samp->MagFilter = param;
+      return GL_TRUE;
+   default:
+      return INVALID_PARAM;
+   }
+}
+
+
+static GLuint
+set_sampler_lod_bias(struct gl_context *ctx, struct gl_sampler_object *samp,
+                     GLfloat param)
+{
+   if (samp->LodBias == param)
+      return GL_FALSE;
+
+   flush(ctx);
+   samp->LodBias = param;
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_border_colorf(struct gl_context *ctx,
+                          struct gl_sampler_object *samp,
+                          const GLfloat params[4])
+{
+   flush(ctx);
+   samp->BorderColor.f[RCOMP] = params[0];
+   samp->BorderColor.f[GCOMP] = params[1];
+   samp->BorderColor.f[BCOMP] = params[2];
+   samp->BorderColor.f[ACOMP] = params[3];
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_border_colori(struct gl_context *ctx,
+                          struct gl_sampler_object *samp,
+                          const GLint params[4])
+{
+   flush(ctx);
+   samp->BorderColor.i[RCOMP] = params[0];
+   samp->BorderColor.i[GCOMP] = params[1];
+   samp->BorderColor.i[BCOMP] = params[2];
+   samp->BorderColor.i[ACOMP] = params[3];
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_border_colorui(struct gl_context *ctx,
+                           struct gl_sampler_object *samp,
+                           const GLuint params[4])
+{
+   flush(ctx);
+   samp->BorderColor.ui[RCOMP] = params[0];
+   samp->BorderColor.ui[GCOMP] = params[1];
+   samp->BorderColor.ui[BCOMP] = params[2];
+   samp->BorderColor.ui[ACOMP] = params[3];
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_min_lod(struct gl_context *ctx, struct gl_sampler_object *samp,
+                    GLfloat param)
+{
+   if (samp->MinLod == param)
+      return GL_FALSE;
+
+   flush(ctx);
+   samp->MinLod = param;
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_max_lod(struct gl_context *ctx, struct gl_sampler_object *samp,
+                    GLint param)
+{
+   if (samp->MaxLod == param)
+      return GL_FALSE;
+
+   flush(ctx);
+   samp->MaxLod = param;
+   return GL_TRUE;
+}
+
+
+static GLuint
+set_sampler_compare_mode(struct gl_context *ctx,
+                         struct gl_sampler_object *samp, GLint param)
+{
+   if (!ctx->Extensions.ARB_shadow)
+      return INVALID_PNAME;
+
+   if (samp->CompareMode == param)
+      return GL_FALSE;
+
+   if (param == GL_NONE ||
+       param == GL_COMPARE_R_TO_TEXTURE_ARB) {
+      flush(ctx);
+      samp->CompareMode = param;
+      return GL_TRUE;
+   }
+
+   return INVALID_PARAM;
+}
+
+
+static GLuint
+set_sampler_compare_func(struct gl_context *ctx,
+                         struct gl_sampler_object *samp, GLint param)
+{
+   if (!ctx->Extensions.ARB_shadow)
+      return INVALID_PNAME;
+
+   if (samp->CompareFunc == param)
+      return GL_FALSE;
+
+   switch (param) {
+   case GL_LEQUAL:
+   case GL_GEQUAL:
+      flush(ctx);
+      samp->CompareFunc = param;
+      return GL_TRUE;
+   case GL_EQUAL:
+   case GL_NOTEQUAL:
+   case GL_LESS:
+   case GL_GREATER:
+   case GL_ALWAYS:
+   case GL_NEVER:
+      if (ctx->Extensions.EXT_shadow_funcs) {
+         flush(ctx);
+         samp->CompareFunc = param;
+         return GL_TRUE;
+      }
+      /* fall-through */
+   default:
+      return INVALID_PARAM;
+   }
+}
+
+
+static GLuint
+set_sampler_max_anisotropy(struct gl_context *ctx,
+                           struct gl_sampler_object *samp, GLfloat param)
+{
+   if (!ctx->Extensions.EXT_texture_filter_anisotropic)
+      return INVALID_PNAME;
+
+   if (samp->MaxAnisotropy == param)
+      return GL_FALSE;
+
+   if (param < 1.0)
+      return INVALID_VALUE;
+
+   flush(ctx);
+   /* clamp to max, that's what NVIDIA does */
+   samp->MaxAnisotropy = MIN2(param, ctx->Const.MaxTextureMaxAnisotropy);
+   return GL_TRUE;
+}
+
+
+static void GLAPIENTRY
+_mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameteri(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, (GLfloat) param);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, (GLfloat) param);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, (GLfloat) param);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) param);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      /* fall-through */
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameteri(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameteri(param=%d)\n",
+                  param);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameteri(param=%d)\n",
+                  param);
+      break;
+   default:
+      ;
+   }
+}
+
+
+static void GLAPIENTRY
+_mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterf(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, (GLint) param);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, param);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      /* fall-through */
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterf(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterf(param=%f)\n",
+                  param);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterf(param=%f)\n",
+                  param);
+      break;
+   default:
+      ;
+   }
+}
+
+static void GLAPIENTRY
+_mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameteriv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      {
+         GLfloat c[4];
+         c[0] = INT_TO_FLOAT(params[0]);
+         c[1] = INT_TO_FLOAT(params[1]);
+         c[2] = INT_TO_FLOAT(params[2]);
+         c[3] = INT_TO_FLOAT(params[3]);
+         res = set_sampler_border_colorf(ctx, sampObj, c);
+      }
+      break;
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameteriv(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameteriv(param=%d)\n",
+                  params[0]);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameteriv(param=%d)\n",
+                  params[0]);
+      break;
+   default:
+      ;
+   }
+}
+
+static void GLAPIENTRY
+_mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterfv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, (GLint) params[0]);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      res = set_sampler_border_colorf(ctx, sampObj, params);
+      break;
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterfv(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterfv(param=%f)\n",
+                  params[0]);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterfv(param=%f)\n",
+                  params[0]);
+      break;
+   default:
+      ;
+   }
+}
+
+static void GLAPIENTRY
+_mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIiv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      res = set_sampler_border_colori(ctx, sampObj, params);
+      break;
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterIiv(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterIiv(param=%d)\n",
+                  params[0]);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIiv(param=%d)\n",
+                  params[0]);
+      break;
+   default:
+      ;
+   }
+}
+
+
+static void GLAPIENTRY
+_mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GLuint res;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIuiv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      res = set_sampler_wrap_s(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_T:
+      res = set_sampler_wrap_t(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_WRAP_R:
+      res = set_sampler_wrap_r(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      res = set_sampler_min_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      res = set_sampler_mag_filter(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      res = set_sampler_min_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      res = set_sampler_max_lod(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      res = set_sampler_lod_bias(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      res = set_sampler_compare_mode(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      res = set_sampler_compare_func(ctx, sampObj, params[0]);
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      res = set_sampler_border_colorui(ctx, sampObj, params);
+      break;
+   default:
+      res = INVALID_PNAME;
+   }
+
+   switch (res) {
+   case GL_FALSE:
+      /* no change */
+      break;
+   case GL_TRUE:
+      /* state change - we do nothing special at this time */
+      break;
+   case INVALID_PNAME:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterIuiv(pname=%s)\n",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   case INVALID_PARAM:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSamplerParameterIuiv(param=%u)\n",
+                  params[0]);
+      break;
+   case INVALID_VALUE:
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIuiv(param=%u)\n",
+                  params[0]);
+      break;
+   default:
+      ;
+   }
+}
+
+
+static void GLAPIENTRY
+_mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetSamplerParameteriv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      *params = sampObj->WrapS;
+      break;
+   case GL_TEXTURE_WRAP_T:
+      *params = sampObj->WrapT;
+      break;
+   case GL_TEXTURE_WRAP_R:
+      *params = sampObj->WrapR;
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      *params = sampObj->MinFilter;
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      *params = sampObj->MagFilter;
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      *params = (GLint) sampObj->MinLod;
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      *params = (GLint) sampObj->MaxLod;
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      *params = (GLint) sampObj->LodBias;
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareMode;
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareFunc;
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      *params = (GLint) sampObj->MaxAnisotropy;
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      params[0] = FLOAT_TO_INT(sampObj->BorderColor.f[0]);
+      params[1] = FLOAT_TO_INT(sampObj->BorderColor.f[1]);
+      params[2] = FLOAT_TO_INT(sampObj->BorderColor.f[2]);
+      params[3] = FLOAT_TO_INT(sampObj->BorderColor.f[3]);
+      break;
+   default:
+      goto invalid_pname;
+   }
+   return;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSamplerParameteriv(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+static void GLAPIENTRY
+_mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetSamplerParameterfv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      *params = (GLfloat) sampObj->WrapS;
+      break;
+   case GL_TEXTURE_WRAP_T:
+      *params = (GLfloat) sampObj->WrapT;
+      break;
+   case GL_TEXTURE_WRAP_R:
+      *params = (GLfloat) sampObj->WrapR;
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      *params = (GLfloat) sampObj->MinFilter;
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      *params = (GLfloat) sampObj->MagFilter;
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      *params = sampObj->MinLod;
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      *params = sampObj->MaxLod;
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      *params = sampObj->LodBias;
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = (GLfloat) sampObj->CompareMode;
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = (GLfloat) sampObj->CompareFunc;
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      *params = sampObj->MaxAnisotropy;
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      params[0] = sampObj->BorderColor.f[0];
+      params[1] = sampObj->BorderColor.f[1];
+      params[2] = sampObj->BorderColor.f[2];
+      params[3] = sampObj->BorderColor.f[3];
+      break;
+   default:
+      goto invalid_pname;
+   }
+   return;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSamplerParameterfv(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+static void GLAPIENTRY
+_mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetSamplerParameterIiv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      *params = sampObj->WrapS;
+      break;
+   case GL_TEXTURE_WRAP_T:
+      *params = sampObj->WrapT;
+      break;
+   case GL_TEXTURE_WRAP_R:
+      *params = sampObj->WrapR;
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      *params = sampObj->MinFilter;
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      *params = sampObj->MagFilter;
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      *params = (GLint) sampObj->MinLod;
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      *params = (GLint) sampObj->MaxLod;
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      *params = (GLint) sampObj->LodBias;
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareMode;
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareFunc;
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      *params = (GLint) sampObj->MaxAnisotropy;
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      params[0] = sampObj->BorderColor.i[0];
+      params[1] = sampObj->BorderColor.i[1];
+      params[2] = sampObj->BorderColor.i[2];
+      params[3] = sampObj->BorderColor.i[3];
+      break;
+   default:
+      goto invalid_pname;
+   }
+   return;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSamplerParameterIiv(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+static void GLAPIENTRY
+_mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
+{
+   struct gl_sampler_object *sampObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   sampObj = _mesa_lookup_samplerobj(ctx, sampler);
+   if (!sampObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetSamplerParameterIuiv(sampler %u)",
+                  sampler);
+      return;
+   }
+
+   switch (pname) {
+   case GL_TEXTURE_WRAP_S:
+      *params = sampObj->WrapS;
+      break;
+   case GL_TEXTURE_WRAP_T:
+      *params = sampObj->WrapT;
+      break;
+   case GL_TEXTURE_WRAP_R:
+      *params = sampObj->WrapR;
+      break;
+   case GL_TEXTURE_MIN_FILTER:
+      *params = sampObj->MinFilter;
+      break;
+   case GL_TEXTURE_MAG_FILTER:
+      *params = sampObj->MagFilter;
+      break;
+   case GL_TEXTURE_MIN_LOD:
+      *params = (GLuint) sampObj->MinLod;
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      *params = (GLuint) sampObj->MaxLod;
+      break;
+   case GL_TEXTURE_LOD_BIAS:
+      *params = (GLuint) sampObj->LodBias;
+      break;
+   case GL_TEXTURE_COMPARE_MODE:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareMode;
+      break;
+   case GL_TEXTURE_COMPARE_FUNC:
+      if (!ctx->Extensions.ARB_shadow)
+         goto invalid_pname;
+      *params = sampObj->CompareFunc;
+      break;
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      *params = (GLuint) sampObj->MaxAnisotropy;
+      break;
+   case GL_TEXTURE_BORDER_COLOR:
+      params[0] = sampObj->BorderColor.ui[0];
+      params[1] = sampObj->BorderColor.ui[1];
+      params[2] = sampObj->BorderColor.ui[2];
+      params[3] = sampObj->BorderColor.ui[3];
+      break;
+   default:
+      goto invalid_pname;
+   }
+   return;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSamplerParameterIuiv(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+void
+_mesa_init_sampler_object_functions(struct dd_function_table *driver)
+{
+   driver->NewSamplerObject = _mesa_new_sampler_object;
+   driver->DeleteSamplerObject = _mesa_delete_sampler_object;
+}
+
+
+void
+_mesa_init_sampler_object_dispatch(struct _glapi_table *disp)
+{
+   SET_GenSamplers(disp, _mesa_GenSamplers);
+   SET_DeleteSamplers(disp, _mesa_DeleteSamplers);
+   SET_IsSampler(disp, _mesa_IsSampler);
+   SET_BindSampler(disp, _mesa_BindSampler);
+   SET_SamplerParameteri(disp, _mesa_SamplerParameteri);
+   SET_SamplerParameterf(disp, _mesa_SamplerParameterf);
+   SET_SamplerParameteriv(disp, _mesa_SamplerParameteriv);
+   SET_SamplerParameterfv(disp, _mesa_SamplerParameterfv);
+   SET_SamplerParameterIiv(disp, _mesa_SamplerParameterIiv);
+   SET_SamplerParameterIuiv(disp, _mesa_SamplerParameterIuiv);
+   SET_GetSamplerParameteriv(disp, _mesa_GetSamplerParameteriv);
+   SET_GetSamplerParameterfv(disp, _mesa_GetSamplerParameterfv);
+   SET_GetSamplerParameterIiv(disp, _mesa_GetSamplerParameterIiv);
+   SET_GetSamplerParameterIuiv(disp, _mesa_GetSamplerParameterIuiv);
+}
diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
new file mode 100644
index 00000000000..ed495c3760b
--- /dev/null
+++ b/src/mesa/main/samplerobj.h
@@ -0,0 +1,54 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2011  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef SAMPLEROBJ_H
+#define SAMPLEROBJ_H
+
+struct dd_function_table;
+
+
+extern void
+_mesa_reference_sampler_object(struct gl_context *ctx,
+                               struct gl_sampler_object **ptr,
+                               struct gl_sampler_object *samp);
+
+extern void
+_mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name);
+
+extern struct gl_sampler_object *
+_mesa_new_sampler_object(struct gl_context *ctx, GLuint name);
+
+extern void
+_mesa_delete_sampler_object(struct gl_context *ctx,
+                            struct gl_sampler_object *sampObj);
+
+extern void
+_mesa_init_sampler_object_functions(struct dd_function_table *driver);
+
+extern void
+_mesa_init_sampler_object_dispatch(struct _glapi_table *disp);
+
+
+#endif /* SAMPLEROBJ_H */
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 6604ed07d53..e470d873f70 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -40,6 +40,9 @@
 #include "shared.h"
 #include "program/program.h"
 #include "dlist.h"
+#if FEATURE_ARB_sampler_objects
+#include "samplerobj.h"
+#endif
 #include "shaderobj.h"
 #include "syncobj.h"
 
@@ -91,6 +94,11 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
    shared->BufferObjects = _mesa_NewHashTable();
 #endif
 
+#if FEATURE_ARB_sampler_objects
+   /* GL_ARB_sampler_objects */
+   shared->SamplerObjects = _mesa_NewHashTable();
+#endif
+
    /* Allocate the default buffer object */
    shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);
 
@@ -270,6 +278,20 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
 }
 
 
+#if FEATURE_ARB_sampler_objects
+/**
+ * Callback for deleting a sampler object. Called by _mesa_HashDeleteAll()
+ */
+static void
+delete_sampler_object_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_context *ctx = (struct gl_context *) userData;
+   struct gl_sampler_object *sampObj = (struct gl_sampler_object *) data;
+   _mesa_reference_sampler_object(ctx, &sampObj, NULL);
+}
+#endif
+
+
 /**
  * Deallocate a shared state object and all children structures.
  *
@@ -345,6 +367,11 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
       }
    }
 
+#if FEATURE_ARB_sampler_objects
+   _mesa_HashDeleteAll(shared->SamplerObjects, delete_sampler_object_cb, ctx);
+   _mesa_DeleteHashTable(shared->SamplerObjects);
+#endif
+
    /*
     * Free texture objects (after FBOs since some textures might have
     * been bound to FBOs).
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index b2181af2931..caabc19bb17 100644
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -975,7 +975,7 @@ _mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims)
 
    ASSERT(dims == 1 || dims == 2 || dims == 3);
 
-   if (texImage->TexObject->sRGBDecode == GL_SKIP_DECODE_EXT &&
+   if (texImage->TexObject->Sampler.sRGBDecode == GL_SKIP_DECODE_EXT &&
        _mesa_get_format_color_encoding(format) == GL_SRGB) {
       format = _mesa_get_srgb_format_linear(format);
    }
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 61b9bc70d77..43d6e52dfe9 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -116,35 +116,37 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->Name = name;
    obj->Target = target;
    obj->Priority = 1.0F;
+   obj->BaseLevel = 0;
+   obj->MaxLevel = 1000;
+
+   /* sampler state */
    if (target == GL_TEXTURE_RECTANGLE_NV) {
-      obj->WrapS = GL_CLAMP_TO_EDGE;
-      obj->WrapT = GL_CLAMP_TO_EDGE;
-      obj->WrapR = GL_CLAMP_TO_EDGE;
-      obj->MinFilter = GL_LINEAR;
+      obj->Sampler.WrapS = GL_CLAMP_TO_EDGE;
+      obj->Sampler.WrapT = GL_CLAMP_TO_EDGE;
+      obj->Sampler.WrapR = GL_CLAMP_TO_EDGE;
+      obj->Sampler.MinFilter = GL_LINEAR;
    }
    else {
-      obj->WrapS = GL_REPEAT;
-      obj->WrapT = GL_REPEAT;
-      obj->WrapR = GL_REPEAT;
-      obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
+      obj->Sampler.WrapS = GL_REPEAT;
+      obj->Sampler.WrapT = GL_REPEAT;
+      obj->Sampler.WrapR = GL_REPEAT;
+      obj->Sampler.MinFilter = GL_NEAREST_MIPMAP_LINEAR;
    }
-   obj->MagFilter = GL_LINEAR;
-   obj->MinLod = -1000.0;
-   obj->MaxLod = 1000.0;
-   obj->LodBias = 0.0;
-   obj->BaseLevel = 0;
-   obj->MaxLevel = 1000;
-   obj->MaxAnisotropy = 1.0;
-   obj->CompareMode = GL_NONE;         /* ARB_shadow */
-   obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */
-   obj->CompareFailValue = 0.0F;       /* ARB_shadow_ambient */
-   obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
+   obj->Sampler.MagFilter = GL_LINEAR;
+   obj->Sampler.MinLod = -1000.0;
+   obj->Sampler.MaxLod = 1000.0;
+   obj->Sampler.LodBias = 0.0;
+   obj->Sampler.MaxAnisotropy = 1.0;
+   obj->Sampler.CompareMode = GL_NONE;         /* ARB_shadow */
+   obj->Sampler.CompareFunc = GL_LEQUAL;       /* ARB_shadow */
+   obj->Sampler.CompareFailValue = 0.0F;       /* ARB_shadow_ambient */
+   obj->Sampler.DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
    obj->Swizzle[0] = GL_RED;
    obj->Swizzle[1] = GL_GREEN;
    obj->Swizzle[2] = GL_BLUE;
    obj->Swizzle[3] = GL_ALPHA;
    obj->_Swizzle = SWIZZLE_NOOP;
-   obj->sRGBDecode = GL_DECODE_EXT;
+   obj->Sampler.sRGBDecode = GL_DECODE_EXT;
 }
 
 
@@ -160,10 +162,10 @@ finish_texture_init(struct gl_context *ctx, GLenum target,
 
    if (target == GL_TEXTURE_RECTANGLE_NV) {
       /* have to init wrap and filter state here - kind of klunky */
-      obj->WrapS = GL_CLAMP_TO_EDGE;
-      obj->WrapT = GL_CLAMP_TO_EDGE;
-      obj->WrapR = GL_CLAMP_TO_EDGE;
-      obj->MinFilter = GL_LINEAR;
+      obj->Sampler.WrapS = GL_CLAMP_TO_EDGE;
+      obj->Sampler.WrapT = GL_CLAMP_TO_EDGE;
+      obj->Sampler.WrapR = GL_CLAMP_TO_EDGE;
+      obj->Sampler.MinFilter = GL_LINEAR;
       if (ctx->Driver.TexParameter) {
          static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE};
          static const GLfloat fparam_filter[1] = {(GLfloat) GL_LINEAR};
@@ -231,25 +233,25 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->Target = src->Target;
    dest->Name = src->Name;
    dest->Priority = src->Priority;
-   dest->BorderColor.f[0] = src->BorderColor.f[0];
-   dest->BorderColor.f[1] = src->BorderColor.f[1];
-   dest->BorderColor.f[2] = src->BorderColor.f[2];
-   dest->BorderColor.f[3] = src->BorderColor.f[3];
-   dest->WrapS = src->WrapS;
-   dest->WrapT = src->WrapT;
-   dest->WrapR = src->WrapR;
-   dest->MinFilter = src->MinFilter;
-   dest->MagFilter = src->MagFilter;
-   dest->MinLod = src->MinLod;
-   dest->MaxLod = src->MaxLod;
-   dest->LodBias = src->LodBias;
+   dest->Sampler.BorderColor.f[0] = src->Sampler.BorderColor.f[0];
+   dest->Sampler.BorderColor.f[1] = src->Sampler.BorderColor.f[1];
+   dest->Sampler.BorderColor.f[2] = src->Sampler.BorderColor.f[2];
+   dest->Sampler.BorderColor.f[3] = src->Sampler.BorderColor.f[3];
+   dest->Sampler.WrapS = src->Sampler.WrapS;
+   dest->Sampler.WrapT = src->Sampler.WrapT;
+   dest->Sampler.WrapR = src->Sampler.WrapR;
+   dest->Sampler.MinFilter = src->Sampler.MinFilter;
+   dest->Sampler.MagFilter = src->Sampler.MagFilter;
+   dest->Sampler.MinLod = src->Sampler.MinLod;
+   dest->Sampler.MaxLod = src->Sampler.MaxLod;
+   dest->Sampler.LodBias = src->Sampler.LodBias;
    dest->BaseLevel = src->BaseLevel;
    dest->MaxLevel = src->MaxLevel;
-   dest->MaxAnisotropy = src->MaxAnisotropy;
-   dest->CompareMode = src->CompareMode;
-   dest->CompareFunc = src->CompareFunc;
-   dest->CompareFailValue = src->CompareFailValue;
-   dest->DepthMode = src->DepthMode;
+   dest->Sampler.MaxAnisotropy = src->Sampler.MaxAnisotropy;
+   dest->Sampler.CompareMode = src->Sampler.CompareMode;
+   dest->Sampler.CompareFunc = src->Sampler.CompareFunc;
+   dest->Sampler.CompareFailValue = src->Sampler.CompareFailValue;
+   dest->Sampler.DepthMode = src->Sampler.DepthMode;
    dest->_MaxLevel = src->_MaxLevel;
    dest->_MaxLambda = src->_MaxLambda;
    dest->GenerateMipmap = src->GenerateMipmap;
@@ -506,7 +508,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
    }
 
    /* extra checking for mipmaps */
-   if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) {
+   if (t->Sampler.MinFilter != GL_NEAREST && t->Sampler.MinFilter != GL_LINEAR) {
       /*
        * Mipmapping: determine if we have a complete set of mipmaps
        */
@@ -761,8 +763,8 @@ _mesa_get_fallback_texture(struct gl_context *ctx)
       /* create texture object */
       texObj = ctx->Driver.NewTextureObject(ctx, 0, GL_TEXTURE_2D);
       assert(texObj->RefCount == 1);
-      texObj->MinFilter = GL_NEAREST;
-      texObj->MagFilter = GL_NEAREST;
+      texObj->Sampler.MinFilter = GL_NEAREST;
+      texObj->Sampler.MagFilter = GL_NEAREST;
 
       /* create level[0] texture image */
       texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, 0);
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 34b6addb9b0..3d56dac3f91 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -216,13 +216,13 @@ set_tex_parameteri(struct gl_context *ctx,
 {
    switch (pname) {
    case GL_TEXTURE_MIN_FILTER:
-      if (texObj->MinFilter == params[0])
+      if (texObj->Sampler.MinFilter == params[0])
          return GL_FALSE;
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
          incomplete(ctx, texObj);
-         texObj->MinFilter = params[0];
+         texObj->Sampler.MinFilter = params[0];
          return GL_TRUE;
       case GL_NEAREST_MIPMAP_NEAREST:
       case GL_LINEAR_MIPMAP_NEAREST:
@@ -230,7 +230,7 @@ set_tex_parameteri(struct gl_context *ctx,
       case GL_LINEAR_MIPMAP_LINEAR:
          if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
             incomplete(ctx, texObj);
-            texObj->MinFilter = params[0];
+            texObj->Sampler.MinFilter = params[0];
             return GL_TRUE;
          }
          /* fall-through */
@@ -240,13 +240,13 @@ set_tex_parameteri(struct gl_context *ctx,
       return GL_FALSE;
 
    case GL_TEXTURE_MAG_FILTER:
-      if (texObj->MagFilter == params[0])
+      if (texObj->Sampler.MagFilter == params[0])
          return GL_FALSE;
       switch (params[0]) {
       case GL_NEAREST:
       case GL_LINEAR:
          flush(ctx); /* does not effect completeness */
-         texObj->MagFilter = params[0];
+         texObj->Sampler.MagFilter = params[0];
          return GL_TRUE;
       default:
          goto invalid_param;
@@ -254,31 +254,31 @@ set_tex_parameteri(struct gl_context *ctx,
       return GL_FALSE;
 
    case GL_TEXTURE_WRAP_S:
-      if (texObj->WrapS == params[0])
+      if (texObj->Sampler.WrapS == params[0])
          return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx);
-         texObj->WrapS = params[0];
+         texObj->Sampler.WrapS = params[0];
          return GL_TRUE;
       }
       return GL_FALSE;
 
    case GL_TEXTURE_WRAP_T:
-      if (texObj->WrapT == params[0])
+      if (texObj->Sampler.WrapT == params[0])
          return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx);
-         texObj->WrapT = params[0];
+         texObj->Sampler.WrapT = params[0];
          return GL_TRUE;
       }
       return GL_FALSE;
 
    case GL_TEXTURE_WRAP_R:
-      if (texObj->WrapR == params[0])
+      if (texObj->Sampler.WrapR == params[0])
          return GL_FALSE;
       if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
          flush(ctx);
-         texObj->WrapR = params[0];
+         texObj->Sampler.WrapR = params[0];
          return GL_TRUE;
       }
       return GL_FALSE;
@@ -318,12 +318,12 @@ set_tex_parameteri(struct gl_context *ctx,
 
    case GL_TEXTURE_COMPARE_MODE_ARB:
       if (ctx->Extensions.ARB_shadow) {
-         if (texObj->CompareMode == params[0])
+         if (texObj->Sampler.CompareMode == params[0])
             return GL_FALSE;
          if (params[0] == GL_NONE ||
              params[0] == GL_COMPARE_R_TO_TEXTURE_ARB) {
             flush(ctx);
-            texObj->CompareMode = params[0];
+            texObj->Sampler.CompareMode = params[0];
             return GL_TRUE;
          }
          goto invalid_param;
@@ -332,13 +332,13 @@ set_tex_parameteri(struct gl_context *ctx,
 
    case GL_TEXTURE_COMPARE_FUNC_ARB:
       if (ctx->Extensions.ARB_shadow) {
-         if (texObj->CompareFunc == params[0])
+         if (texObj->Sampler.CompareFunc == params[0])
             return GL_FALSE;
          switch (params[0]) {
          case GL_LEQUAL:
          case GL_GEQUAL:
             flush(ctx);
-            texObj->CompareFunc = params[0];
+            texObj->Sampler.CompareFunc = params[0];
             return GL_TRUE;
          case GL_EQUAL:
          case GL_NOTEQUAL:
@@ -348,7 +348,7 @@ set_tex_parameteri(struct gl_context *ctx,
          case GL_NEVER:
             if (ctx->Extensions.EXT_shadow_funcs) {
                flush(ctx);
-               texObj->CompareFunc = params[0];
+               texObj->Sampler.CompareFunc = params[0];
                return GL_TRUE;
             }
             /* fall-through */
@@ -360,14 +360,14 @@ set_tex_parameteri(struct gl_context *ctx,
 
    case GL_DEPTH_TEXTURE_MODE_ARB:
       if (ctx->Extensions.ARB_depth_texture) {
-         if (texObj->DepthMode == params[0])
+         if (texObj->Sampler.DepthMode == params[0])
             return GL_FALSE;
          if (params[0] == GL_LUMINANCE ||
              params[0] == GL_INTENSITY ||
              params[0] == GL_ALPHA ||
              (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) {
             flush(ctx);
-            texObj->DepthMode = params[0];
+            texObj->Sampler.DepthMode = params[0];
             return GL_TRUE;
          }
          goto invalid_param;
@@ -429,9 +429,9 @@ set_tex_parameteri(struct gl_context *ctx,
       if (ctx->Extensions.EXT_texture_sRGB_decode) {
 	 GLenum decode = params[0];
 	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {
-	    if (texObj->sRGBDecode != decode) {
+	    if (texObj->Sampler.sRGBDecode != decode) {
 	       flush(ctx);
-	       texObj->sRGBDecode = decode;
+	       texObj->Sampler.sRGBDecode = decode;
 	       _mesa_update_fetch_functions(texObj);
 	    }
 	    return GL_TRUE;
@@ -466,17 +466,17 @@ set_tex_parameterf(struct gl_context *ctx,
 {
    switch (pname) {
    case GL_TEXTURE_MIN_LOD:
-      if (texObj->MinLod == params[0])
+      if (texObj->Sampler.MinLod == params[0])
          return GL_FALSE;
       flush(ctx);
-      texObj->MinLod = params[0];
+      texObj->Sampler.MinLod = params[0];
       return GL_TRUE;
 
    case GL_TEXTURE_MAX_LOD:
-      if (texObj->MaxLod == params[0])
+      if (texObj->Sampler.MaxLod == params[0])
          return GL_FALSE;
       flush(ctx);
-      texObj->MaxLod = params[0];
+      texObj->Sampler.MaxLod = params[0];
       return GL_TRUE;
 
    case GL_TEXTURE_PRIORITY:
@@ -486,7 +486,7 @@ set_tex_parameterf(struct gl_context *ctx,
 
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-         if (texObj->MaxAnisotropy == params[0])
+         if (texObj->Sampler.MaxAnisotropy == params[0])
             return GL_FALSE;
          if (params[0] < 1.0) {
             _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
@@ -494,7 +494,7 @@ set_tex_parameterf(struct gl_context *ctx,
          }
          flush(ctx);
          /* clamp to max, that's what NVIDIA does */
-         texObj->MaxAnisotropy = MIN2(params[0],
+         texObj->Sampler.MaxAnisotropy = MIN2(params[0],
                                       ctx->Const.MaxTextureMaxAnisotropy);
          return GL_TRUE;
       }
@@ -508,9 +508,9 @@ set_tex_parameterf(struct gl_context *ctx,
 
    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
       if (ctx->Extensions.ARB_shadow_ambient) {
-         if (texObj->CompareFailValue != params[0]) {
+         if (texObj->Sampler.CompareFailValue != params[0]) {
             flush(ctx);
-            texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
+            texObj->Sampler.CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
             return GL_TRUE;
          }
       }
@@ -523,9 +523,9 @@ set_tex_parameterf(struct gl_context *ctx,
    case GL_TEXTURE_LOD_BIAS:
       /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
       if (ctx->Extensions.EXT_texture_lod_bias) {
-         if (texObj->LodBias != params[0]) {
+         if (texObj->Sampler.LodBias != params[0]) {
             flush(ctx);
-            texObj->LodBias = params[0];
+            texObj->Sampler.LodBias = params[0];
             return GL_TRUE;
          }
          return GL_FALSE;
@@ -536,15 +536,15 @@ set_tex_parameterf(struct gl_context *ctx,
       flush(ctx);
       /* ARB_texture_float disables clamping */
       if (ctx->Extensions.ARB_texture_float) {
-         texObj->BorderColor.f[RCOMP] = params[0];
-         texObj->BorderColor.f[GCOMP] = params[1];
-         texObj->BorderColor.f[BCOMP] = params[2];
-         texObj->BorderColor.f[ACOMP] = params[3];
+         texObj->Sampler.BorderColor.f[RCOMP] = params[0];
+         texObj->Sampler.BorderColor.f[GCOMP] = params[1];
+         texObj->Sampler.BorderColor.f[BCOMP] = params[2];
+         texObj->Sampler.BorderColor.f[ACOMP] = params[3];
       } else {
-         texObj->BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);
-         texObj->BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);
-         texObj->BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);
-         texObj->BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);
       }
       return GL_TRUE;
 
@@ -784,7 +784,7 @@ _mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
    case GL_TEXTURE_BORDER_COLOR:
       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
       /* set the integer-valued border color */
-      COPY_4V(texObj->BorderColor.i, params);
+      COPY_4V(texObj->Sampler.BorderColor.i, params);
       break;
    default:
       _mesa_TexParameteriv(target, pname, params);
@@ -814,7 +814,7 @@ _mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
    case GL_TEXTURE_BORDER_COLOR:
       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
       /* set the unsigned integer-valued border color */
-      COPY_4V(texObj->BorderColor.ui, params);
+      COPY_4V(texObj->Sampler.BorderColor.ui, params);
       break;
    default:
       _mesa_TexParameteriv(target, pname, (const GLint *) params);
@@ -1101,36 +1101,36 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
    _mesa_lock_texture(ctx, obj);
    switch (pname) {
       case GL_TEXTURE_MAG_FILTER:
-	 *params = ENUM_TO_FLOAT(obj->MagFilter);
+	 *params = ENUM_TO_FLOAT(obj->Sampler.MagFilter);
 	 break;
       case GL_TEXTURE_MIN_FILTER:
-         *params = ENUM_TO_FLOAT(obj->MinFilter);
+         *params = ENUM_TO_FLOAT(obj->Sampler.MinFilter);
          break;
       case GL_TEXTURE_WRAP_S:
-         *params = ENUM_TO_FLOAT(obj->WrapS);
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapS);
          break;
       case GL_TEXTURE_WRAP_T:
-         *params = ENUM_TO_FLOAT(obj->WrapT);
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapT);
          break;
       case GL_TEXTURE_WRAP_R:
-         *params = ENUM_TO_FLOAT(obj->WrapR);
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapR);
          break;
       case GL_TEXTURE_BORDER_COLOR:
          if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))
             _mesa_update_state_locked(ctx);
          if(ctx->Color._ClampFragmentColor)
          {
-            params[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);
-            params[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);
-            params[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);
-            params[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);
+            params[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);
+            params[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);
+            params[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);
+            params[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);
          }
          else
          {
-            params[0] = obj->BorderColor.f[0];
-            params[1] = obj->BorderColor.f[1];
-            params[2] = obj->BorderColor.f[2];
-            params[3] = obj->BorderColor.f[3];
+            params[0] = obj->Sampler.BorderColor.f[0];
+            params[1] = obj->Sampler.BorderColor.f[1];
+            params[2] = obj->Sampler.BorderColor.f[2];
+            params[3] = obj->Sampler.BorderColor.f[3];
          }
          break;
       case GL_TEXTURE_RESIDENT:
@@ -1147,10 +1147,10 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          *params = obj->Priority;
          break;
       case GL_TEXTURE_MIN_LOD:
-         *params = obj->MinLod;
+         *params = obj->Sampler.MinLod;
          break;
       case GL_TEXTURE_MAX_LOD:
-         *params = obj->MaxLod;
+         *params = obj->Sampler.MaxLod;
          break;
       case GL_TEXTURE_BASE_LEVEL:
          *params = (GLfloat) obj->BaseLevel;
@@ -1160,14 +1160,14 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          break;
       case GL_TEXTURE_MAX_ANISOTROPY_EXT:
          if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = obj->MaxAnisotropy;
+            *params = obj->Sampler.MaxAnisotropy;
          }
 	 else
 	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
          if (ctx->Extensions.ARB_shadow_ambient) {
-            *params = obj->CompareFailValue;
+            *params = obj->Sampler.CompareFailValue;
          }
 	 else 
 	    error = GL_TRUE;
@@ -1177,28 +1177,28 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareMode;
+            *params = (GLfloat) obj->Sampler.CompareMode;
          }
 	 else 
 	    error = GL_TRUE;
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
          if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareFunc;
+            *params = (GLfloat) obj->Sampler.CompareFunc;
          }
 	 else 
 	    error = GL_TRUE;
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
          if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLfloat) obj->DepthMode;
+            *params = (GLfloat) obj->Sampler.DepthMode;
          }
 	 else 
 	    error = GL_TRUE;
          break;
       case GL_TEXTURE_LOD_BIAS:
          if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = obj->LodBias;
+            *params = obj->Sampler.LodBias;
          }
 	 else 
 	    error = GL_TRUE;
@@ -1265,27 +1265,27 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
    _mesa_lock_texture(ctx, obj);
    switch (pname) {
       case GL_TEXTURE_MAG_FILTER:
-         *params = (GLint) obj->MagFilter;
+         *params = (GLint) obj->Sampler.MagFilter;
          break;;
       case GL_TEXTURE_MIN_FILTER:
-         *params = (GLint) obj->MinFilter;
+         *params = (GLint) obj->Sampler.MinFilter;
          break;;
       case GL_TEXTURE_WRAP_S:
-         *params = (GLint) obj->WrapS;
+         *params = (GLint) obj->Sampler.WrapS;
          break;;
       case GL_TEXTURE_WRAP_T:
-         *params = (GLint) obj->WrapT;
+         *params = (GLint) obj->Sampler.WrapT;
          break;;
       case GL_TEXTURE_WRAP_R:
-         *params = (GLint) obj->WrapR;
+         *params = (GLint) obj->Sampler.WrapR;
          break;;
       case GL_TEXTURE_BORDER_COLOR:
          {
             GLfloat b[4];
-            b[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);
-            b[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);
-            b[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);
-            b[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);
+            b[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);
+            b[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);
+            b[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);
+            b[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);
             params[0] = FLOAT_TO_INT(b[0]);
             params[1] = FLOAT_TO_INT(b[1]);
             params[2] = FLOAT_TO_INT(b[2]);
@@ -1306,10 +1306,10 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          *params = FLOAT_TO_INT(obj->Priority);
          break;;
       case GL_TEXTURE_MIN_LOD:
-         *params = (GLint) obj->MinLod;
+         *params = (GLint) obj->Sampler.MinLod;
          break;;
       case GL_TEXTURE_MAX_LOD:
-         *params = (GLint) obj->MaxLod;
+         *params = (GLint) obj->Sampler.MaxLod;
          break;;
       case GL_TEXTURE_BASE_LEVEL:
          *params = obj->BaseLevel;
@@ -1319,7 +1319,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;;
       case GL_TEXTURE_MAX_ANISOTROPY_EXT:
          if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = (GLint) obj->MaxAnisotropy;
+            *params = (GLint) obj->Sampler.MaxAnisotropy;
          }
          else {
             error = GL_TRUE;
@@ -1327,7 +1327,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
          if (ctx->Extensions.ARB_shadow_ambient) {
-            *params = (GLint) FLOAT_TO_INT(obj->CompareFailValue);
+            *params = (GLint) FLOAT_TO_INT(obj->Sampler.CompareFailValue);
          }
          else {
             error = GL_TRUE;
@@ -1338,7 +1338,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareMode;
+            *params = (GLint) obj->Sampler.CompareMode;
          }
          else {
             error = GL_TRUE;
@@ -1346,7 +1346,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
          if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareFunc;
+            *params = (GLint) obj->Sampler.CompareFunc;
          }
          else {
             error = GL_TRUE;
@@ -1354,7 +1354,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
          if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLint) obj->DepthMode;
+            *params = (GLint) obj->Sampler.DepthMode;
          }
          else {
             error = GL_TRUE;
@@ -1362,7 +1362,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
       case GL_TEXTURE_LOD_BIAS:
          if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = (GLint) obj->LodBias;
+            *params = (GLint) obj->Sampler.LodBias;
          }
          else {
             error = GL_TRUE;
@@ -1422,7 +1422,7 @@ _mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
    
    switch (pname) {
    case GL_TEXTURE_BORDER_COLOR:
-      COPY_4V(params, texObj->BorderColor.i);
+      COPY_4V(params, texObj->Sampler.BorderColor.i);
       break;
    default:
       _mesa_GetTexParameteriv(target, pname, params);
@@ -1442,7 +1442,7 @@ _mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
    
    switch (pname) {
    case GL_TEXTURE_BORDER_COLOR:
-      COPY_4V(params, texObj->BorderColor.i);
+      COPY_4V(params, texObj->Sampler.BorderColor.i);
       break;
    default:
       {
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 82e69ae11b5..1810b88b2bf 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -407,7 +407,7 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)
       }
       else if (format == GL_DEPTH_COMPONENT ||
                format == GL_DEPTH_STENCIL_EXT) {
-         format = texObj->DepthMode;
+         format = texObj->Sampler.DepthMode;
       }
       calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
       texUnit->_CurrentCombine = & texUnit->_EnvMode;
@@ -827,6 +827,12 @@ _mesa_free_texture_data(struct gl_context *ctx)
 
    /* GL_ARB_texture_buffer_object */
    _mesa_reference_buffer_object(ctx, &ctx->Texture.BufferObject, NULL);
+
+#if FEATURE_sampler_objects
+   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {
+      _mesa_reference_sampler_object(ctx, &ctx->Texture.Unit[u].Sampler, NULL);
+   }
+#endif
 }
 
 
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 384aa2cb2c6..1fd26f44d56 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -582,7 +582,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
                value[0] =
                value[1] =
                value[2] =
-               value[3] = texObj->CompareFailValue;
+               value[3] = texObj->Sampler.CompareFailValue;
             }
          }
          return;
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index fcf8ab2e794..9b2cb1a3c14 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -71,6 +71,7 @@ MAIN_SOURCES = \
 	main/readpix.c \
 	main/remap.c \
 	main/renderbuffer.c \
+	main/samplerobj.c \
 	main/scissor.c \
 	main/shaderapi.c \
 	main/shaderobj.c \
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 19d41e7061a..808aa73a083 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -38,6 +38,7 @@
 #include "st_cb_texture.h"
 #include "st_format.h"
 #include "st_atom.h"
+#include "st_texture.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 
@@ -138,6 +139,7 @@ update_samplers(struct st_context *st)
       if (samplersUsed & (1 << su)) {
          struct gl_texture_object *texobj;
          struct gl_texture_image *teximg;
+         struct gl_sampler_object *msamp;
          GLuint texUnit;
 
          if (fprog->Base.SamplersUsed & (1 << su))
@@ -152,25 +154,27 @@ update_samplers(struct st_context *st)
 
          teximg = texobj->Image[0][texobj->BaseLevel];
 
-         sampler->wrap_s = gl_wrap_xlate(texobj->WrapS);
-         sampler->wrap_t = gl_wrap_xlate(texobj->WrapT);
-         sampler->wrap_r = gl_wrap_xlate(texobj->WrapR);
+         msamp = st_get_mesa_sampler(st->ctx, texUnit);
 
-         sampler->min_img_filter = gl_filter_to_img_filter(texobj->MinFilter);
-         sampler->min_mip_filter = gl_filter_to_mip_filter(texobj->MinFilter);
-         sampler->mag_img_filter = gl_filter_to_img_filter(texobj->MagFilter);
+         sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
+         sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
+         sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);
+
+         sampler->min_img_filter = gl_filter_to_img_filter(msamp->MinFilter);
+         sampler->min_mip_filter = gl_filter_to_mip_filter(msamp->MinFilter);
+         sampler->mag_img_filter = gl_filter_to_img_filter(msamp->MagFilter);
 
          if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
             sampler->normalized_coords = 1;
 
          sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +
-            texobj->LodBias;
+            msamp->LodBias;
 
-         sampler->min_lod = CLAMP(texobj->MinLod,
+         sampler->min_lod = CLAMP(msamp->MinLod,
                                   0.0f,
                                   (GLfloat) texobj->MaxLevel - texobj->BaseLevel);
          sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,
-                                 texobj->MaxLod);
+                                 msamp->MaxLod);
          if (sampler->max_lod < sampler->min_lod) {
             /* The GL spec doesn't seem to specify what to do in this case.
              * Swap the values.
@@ -181,17 +185,18 @@ update_samplers(struct st_context *st)
             assert(sampler->min_lod <= sampler->max_lod);
          }
 
-         st_translate_color(texobj->BorderColor.f,
+         st_translate_color(msamp->BorderColor.f,
                             teximg ? teximg->_BaseFormat : GL_RGBA,
                             sampler->border_color);
 
-	 sampler->max_anisotropy = (texobj->MaxAnisotropy == 1.0 ? 0 : (GLuint)texobj->MaxAnisotropy);
+	 sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?
+                                    0 : (GLuint) msamp->MaxAnisotropy);
 
          /* only care about ARB_shadow, not SGI shadow */
-         if (texobj->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
+         if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
             sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;
             sampler->compare_func
-               = st_compare_func_to_pipe(texobj->CompareFunc);
+               = st_compare_func_to_pipe(msamp->CompareFunc);
          }
 
          st->state.num_samplers = su + 1;
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 6b9f969ac00..e5fb8f86878 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -138,12 +138,13 @@ check_sampler_swizzle(struct pipe_sampler_view *sv,
 static INLINE struct pipe_sampler_view *
 st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,
 					  struct st_texture_object *stObj,
+                                          const struct gl_sampler_object *samp,
 					  enum pipe_format format)
 {
    struct pipe_sampler_view templ;
    GLuint swizzle = apply_depthmode(stObj->pt->format,
                                     stObj->base._Swizzle,
-                                    stObj->base.DepthMode);
+                                    samp->DepthMode);
 
    u_sampler_view_default_template(&templ,
                                    stObj->pt,
@@ -164,6 +165,7 @@ st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,
 static INLINE struct pipe_sampler_view *
 st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
 				       struct pipe_context *pipe,
+                                       const struct gl_sampler_object *samp,
 				       enum pipe_format format)
 {
    if (!stObj || !stObj->pt) {
@@ -172,7 +174,7 @@ st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
 
    if (!stObj->sampler_view) {
       stObj->sampler_view =
-         st_create_texture_sampler_view_from_stobj(pipe, stObj, format);
+         st_create_texture_sampler_view_from_stobj(pipe, stObj, samp, format);
    }
 
    return stObj->sampler_view;
@@ -200,16 +202,20 @@ update_textures(struct st_context *st)
          struct st_texture_object *stObj;
          GLboolean retval;
          GLuint texUnit;
+         const struct gl_sampler_object *samp;
 
          if (fprog->Base.SamplersUsed & (1 << su))
             texUnit = fprog->Base.SamplerUnits[su];
          else
             texUnit = vprog->Base.SamplerUnits[su];
 
+         samp = st_get_mesa_sampler(st->ctx, texUnit);
+
          texObj = st->ctx->Texture.Unit[texUnit]._Current;
 
          if (!texObj) {
             texObj = st_get_default_texture(st);
+            samp = &texObj->Sampler;
          }
          stObj = st_texture_object(texObj);
 
@@ -228,7 +234,7 @@ update_textures(struct st_context *st)
 	    enum pipe_format firstImageFormat =
                st_mesa_format_to_pipe_format(texFormat);
 
-	    if ((stObj->base.sRGBDecode == GL_SKIP_DECODE_EXT) &&
+	    if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
                 (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
                /* don't do sRGB->RGB conversion.  Interpret the texture
                 * texture data as linear values.
@@ -248,12 +254,14 @@ update_textures(struct st_context *st)
 	 if (stObj->sampler_view)
             if (check_sampler_swizzle(stObj->sampler_view,
                                       stObj->base._Swizzle,
-                                      stObj->base.DepthMode) ||
+                                      samp->DepthMode) ||
                 (st_view_format != stObj->sampler_view->format) ||
                 stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level)
 	       pipe_sampler_view_reference(&stObj->sampler_view, NULL);
 
-         sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe, st_view_format);
+         sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe,
+                                                               samp,
+                                                               st_view_format);
       }
       pipe_sampler_view_reference(&st->state.sampler_views[su], sampler_view);
    }
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 302f2e1fa17..914c06b7023 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -362,8 +362,8 @@ guess_and_alloc_texture(struct st_context *st,
     * to re-allocating a texture buffer with space for more (or fewer)
     * mipmap levels later.
     */
-   if ((stObj->base.MinFilter == GL_NEAREST ||
-        stObj->base.MinFilter == GL_LINEAR ||
+   if ((stObj->base.Sampler.MinFilter == GL_NEAREST ||
+        stObj->base.Sampler.MinFilter == GL_LINEAR ||
         stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||
         stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT) &&
        !stObj->base.GenerateMipmap &&
@@ -1742,8 +1742,8 @@ st_finalize_texture(struct gl_context *ctx,
        * incomplete.  In that case, we'll have set stObj->lastLevel before
        * we get here.
        */
-      if (stObj->base.MinFilter == GL_LINEAR ||
-          stObj->base.MinFilter == GL_NEAREST)
+      if (stObj->base.Sampler.MinFilter == GL_LINEAR ||
+          stObj->base.Sampler.MinFilter == GL_NEAREST)
          stObj->lastLevel = stObj->base.BaseLevel;
       else
          stObj->lastLevel = stObj->base._MaxLevel;
@@ -1890,8 +1890,8 @@ st_get_default_texture(struct st_context *st)
                   texObj, texImg,
                   0, 0);
 
-      texObj->MinFilter = GL_NEAREST;
-      texObj->MagFilter = GL_NEAREST;
+      texObj->Sampler.MinFilter = GL_NEAREST;
+      texObj->Sampler.MagFilter = GL_NEAREST;
       texObj->_Complete = GL_TRUE;
 
       st->default_texture = texObj;
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index a9461899ad5..ce78956e359 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -27,6 +27,7 @@
 
 #include "main/imports.h"
 #include "main/context.h"
+#include "main/samplerobj.h"
 #include "main/shaderobj.h"
 #include "program/prog_cache.h"
 #include "vbo/vbo.h"
@@ -269,6 +270,7 @@ void st_destroy_context( struct st_context *st )
 void st_init_driver_functions(struct dd_function_table *functions)
 {
    _mesa_init_shader_object_functions(functions);
+   _mesa_init_sampler_object_functions(functions);
 
    st_init_accum_functions(functions);
    st_init_blit_functions(functions);
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index e3277904417..9bc9d7a10f5 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -228,6 +228,7 @@ void st_init_extensions(struct st_context *st)
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
    ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
    ctx->Extensions.ARB_multisample = GL_TRUE;
+   ctx->Extensions.ARB_sampler_objects = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */
    ctx->Extensions.ARB_texture_compression = GL_TRUE;
    ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index d50c3c9af79..903e30df52f 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -163,6 +163,21 @@ st_get_texture_sampler_view(struct st_texture_object *stObj,
 }
 
 
+/**
+ * Get pointer to the active sampler object for the given texture unit.
+ * This will either be a user-defined sampler object or the texture
+ * object's own sampler state.
+ */
+static INLINE struct gl_sampler_object *
+st_get_mesa_sampler(const struct gl_context *ctx, GLuint unit)
+{
+   if (ctx->Texture.Unit[unit].Sampler)
+      return ctx->Texture.Unit[unit].Sampler;
+   else
+      return &ctx->Texture.Unit[unit]._Current->Sampler;
+}
+
+
 extern struct pipe_resource *
 st_texture_create(struct st_context *st,
                   enum pipe_texture_target target,
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index e391043f4d9..b6bfeaed4a9 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -71,7 +71,7 @@ fetch_texel_lod( struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lamb
       SWcontext *swrast = SWRAST_CONTEXT(ctx);
       GLfloat rgba[4];
 
-      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
+      lambda = CLAMP(lambda, texObj->Sampler.MinLod, texObj->Sampler.MaxLod);
 
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
@@ -115,9 +115,9 @@ fetch_texel_deriv( struct gl_context *ctx, const GLfloat texcoord[4],
                                       texcoord[0], texcoord[1], texcoord[3],
                                       1.0F / texcoord[3]);
 
-      lambda += lodBias + texUnit->LodBias + texObj->LodBias;
+      lambda += lodBias + texUnit->LodBias + texObj->Sampler.LodBias;
 
-      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
+      lambda = CLAMP(lambda, texObj->Sampler.MinLod, texObj->Sampler.MaxLod);
 
       swrast->TextureSample[unit](ctx, texObj, 1,
                                   (const GLfloat (*)[4]) texcoord,
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index ef38a6b22b8..9cfecc9e3a4 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -490,7 +490,7 @@ interpolate_texcoords(struct gl_context *ctx, SWspan *span)
 
          if (obj) {
             const struct gl_texture_image *img = obj->Image[0][obj->BaseLevel];
-            needLambda = (obj->MinFilter != obj->MagFilter)
+            needLambda = (obj->Sampler.MinFilter != obj->Sampler.MagFilter)
                || ctx->FragmentProgram._Current;
             texW = img->WidthScale;
             texH = img->HeightScale;
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 0c8cc9ff37b..7f49b6ffa50 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -631,9 +631,9 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
 
          /* adjust texture lod (lambda) */
          if (span->arrayMask & SPAN_LAMBDA) {
-            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
+            if (texUnit->LodBias + curObj->Sampler.LodBias != 0.0F) {
                /* apply LOD bias, but don't clamp yet */
-               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->Sampler.LodBias,
                                           -ctx->Const.MaxTextureLodBias,
                                           ctx->Const.MaxTextureLodBias);
                GLuint i;
@@ -642,10 +642,11 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
                }
             }
 
-            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
+            if (curObj->Sampler.MinLod != -1000.0 ||
+                curObj->Sampler.MaxLod != 1000.0) {
                /* apply LOD clamping to lambda */
-               const GLfloat min = curObj->MinLod;
-               const GLfloat max = curObj->MaxLod;
+               const GLfloat min = curObj->Sampler.MinLod;
+               const GLfloat max = curObj->Sampler.MaxLod;
                GLuint i;
                for (i = 0; i < span->end; i++) {
                   GLfloat l = lambda[i];
@@ -686,9 +687,9 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
 
          /* adjust texture lod (lambda) */
          if (span->arrayMask & SPAN_LAMBDA) {
-            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
+            if (texUnit->LodBias + curObj->Sampler.LodBias != 0.0F) {
                /* apply LOD bias, but don't clamp yet */
-               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->Sampler.LodBias,
                                           -ctx->Const.MaxTextureLodBias,
                                           ctx->Const.MaxTextureLodBias);
                GLuint i;
@@ -697,10 +698,11 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
                }
             }
 
-            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
+            if (curObj->Sampler.MinLod != -1000.0 ||
+                curObj->Sampler.MaxLod != 1000.0) {
                /* apply LOD clamping to lambda */
-               const GLfloat min = curObj->MinLod;
-               const GLfloat max = curObj->MaxLod;
+               const GLfloat min = curObj->Sampler.MinLod;
+               const GLfloat max = curObj->Sampler.MaxLod;
                GLuint i;
                for (i = 0; i < span->end; i++) {
                   GLfloat l = lambda[i];
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index 42785400c0e..106f8b75f9e 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -505,28 +505,28 @@ nearest_texcoord(const struct gl_texture_object *texObj,
 
    switch (texObj->Target) {
    case GL_TEXTURE_RECTANGLE_ARB:
-      *i = clamp_rect_coord_nearest(texObj->WrapS, texcoord[0], width);
-      *j = clamp_rect_coord_nearest(texObj->WrapT, texcoord[1], height);
+      *i = clamp_rect_coord_nearest(texObj->Sampler.WrapS, texcoord[0], width);
+      *j = clamp_rect_coord_nearest(texObj->Sampler.WrapT, texcoord[1], height);
       *k = 0;
       break;
    case GL_TEXTURE_1D:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
+      *i = nearest_texel_location(texObj->Sampler.WrapS, img, width, texcoord[0]);
       *j = 0;
       *k = 0;
       break;
    case GL_TEXTURE_2D:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);
+      *i = nearest_texel_location(texObj->Sampler.WrapS, img, width, texcoord[0]);
+      *j = nearest_texel_location(texObj->Sampler.WrapT, img, height, texcoord[1]);
       *k = 0;
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
+      *i = nearest_texel_location(texObj->Sampler.WrapS, img, width, texcoord[0]);
       *j = tex_array_slice(texcoord[1], height);
       *k = 0;
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);
+      *i = nearest_texel_location(texObj->Sampler.WrapS, img, width, texcoord[0]);
+      *j = nearest_texel_location(texObj->Sampler.WrapT, img, height, texcoord[1]);
       *k = tex_array_slice(texcoord[2], depth);
       break;
    default:
@@ -553,24 +553,24 @@ linear_texcoord(const struct gl_texture_object *texObj,
 
    switch (texObj->Target) {
    case GL_TEXTURE_RECTANGLE_ARB:
-      clamp_rect_coord_linear(texObj->WrapS, texcoord[0],
+      clamp_rect_coord_linear(texObj->Sampler.WrapS, texcoord[0],
                               width, i0, i1, wi);
-      clamp_rect_coord_linear(texObj->WrapT, texcoord[1],
+      clamp_rect_coord_linear(texObj->Sampler.WrapT, texcoord[1],
                               height, j0, j1, wj);
       *slice = 0;
       break;
 
    case GL_TEXTURE_1D:
    case GL_TEXTURE_2D:
-      linear_texel_locations(texObj->WrapS, img, width,
+      linear_texel_locations(texObj->Sampler.WrapS, img, width,
                              texcoord[0], i0, i1, wi);
-      linear_texel_locations(texObj->WrapT, img, height,
+      linear_texel_locations(texObj->Sampler.WrapT, img, height,
                              texcoord[1], j0, j1, wj);
       *slice = 0;
       break;
 
    case GL_TEXTURE_1D_ARRAY_EXT:
-      linear_texel_locations(texObj->WrapS, img, width,
+      linear_texel_locations(texObj->Sampler.WrapS, img, width,
                              texcoord[0], i0, i1, wi);
       *j0 = tex_array_slice(texcoord[1], height);
       *j1 = *j0;
@@ -578,9 +578,9 @@ linear_texcoord(const struct gl_texture_object *texObj,
       break;
 
    case GL_TEXTURE_2D_ARRAY_EXT:
-      linear_texel_locations(texObj->WrapS, img, width,
+      linear_texel_locations(texObj->Sampler.WrapS, img, width,
                              texcoord[0], i0, i1, wi);
-      linear_texel_locations(texObj->WrapT, img, height,
+      linear_texel_locations(texObj->Sampler.WrapT, img, height,
                              texcoord[1], j0, j1, wj);
       *slice = tex_array_slice(texcoord[2], depth);
       break;
@@ -656,12 +656,12 @@ compute_min_mag_ranges(const struct gl_texture_object *tObj,
    GLfloat minMagThresh;
 
    /* we shouldn't be here if minfilter == magfilter */
-   ASSERT(tObj->MinFilter != tObj->MagFilter);
+   ASSERT(tObj->Sampler.MinFilter != tObj->Sampler.MagFilter);
 
    /* This bit comes from the OpenGL spec: */
-   if (tObj->MagFilter == GL_LINEAR
-       && (tObj->MinFilter == GL_NEAREST_MIPMAP_NEAREST ||
-           tObj->MinFilter == GL_NEAREST_MIPMAP_LINEAR)) {
+   if (tObj->Sampler.MagFilter == GL_LINEAR
+       && (tObj->Sampler.MinFilter == GL_NEAREST_MIPMAP_NEAREST ||
+           tObj->Sampler.MinFilter == GL_NEAREST_MIPMAP_LINEAR)) {
       minMagThresh = 0.5F;
    }
    else {
@@ -763,28 +763,28 @@ get_border_color(const struct gl_texture_object *tObj,
 {
    switch (img->_BaseFormat) {
    case GL_RGB:
-      rgba[0] = tObj->BorderColor.f[0];
-      rgba[1] = tObj->BorderColor.f[1];
-      rgba[2] = tObj->BorderColor.f[2];
+      rgba[0] = tObj->Sampler.BorderColor.f[0];
+      rgba[1] = tObj->Sampler.BorderColor.f[1];
+      rgba[2] = tObj->Sampler.BorderColor.f[2];
       rgba[3] = 1.0F;
       break;
    case GL_ALPHA:
       rgba[0] = rgba[1] = rgba[2] = 0.0;
-      rgba[3] = tObj->BorderColor.f[3];
+      rgba[3] = tObj->Sampler.BorderColor.f[3];
       break;
    case GL_LUMINANCE:
-      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];
+      rgba[0] = rgba[1] = rgba[2] = tObj->Sampler.BorderColor.f[0];
       rgba[3] = 1.0;
       break;
    case GL_LUMINANCE_ALPHA:
-      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];
-      rgba[3] = tObj->BorderColor.f[3];
+      rgba[0] = rgba[1] = rgba[2] = tObj->Sampler.BorderColor.f[0];
+      rgba[3] = tObj->Sampler.BorderColor.f[3];
       break;
    case GL_INTENSITY:
-      rgba[0] = rgba[1] = rgba[2] = rgba[3] = tObj->BorderColor.f[0];
+      rgba[0] = rgba[1] = rgba[2] = rgba[3] = tObj->Sampler.BorderColor.f[0];
       break;
    default:
-      COPY_4V(rgba, tObj->BorderColor.f);
+      COPY_4V(rgba, tObj->Sampler.BorderColor.f);
    }
 }
 
@@ -804,7 +804,7 @@ sample_1d_nearest(struct gl_context *ctx,
 {
    const GLint width = img->Width2;  /* without border, power of two */
    GLint i;
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
+   i = nearest_texel_location(tObj->Sampler.WrapS, img, width, texcoord[0]);
    /* skip over the border, if any */
    i += img->Border;
    if (i < 0 || i >= (GLint) img->Width) {
@@ -832,7 +832,7 @@ sample_1d_linear(struct gl_context *ctx,
    GLfloat a;
    GLfloat t0[4], t1[4];  /* texels */
 
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
+   linear_texel_locations(tObj->Sampler.WrapS, img, width, texcoord[0], &i0, &i1, &a);
 
    if (img->Border) {
       i0 += img->Border;
@@ -991,7 +991,7 @@ sample_lambda_1d( struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          for (i = minStart; i < minEnd; i++)
             sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -1026,7 +1026,7 @@ sample_lambda_1d( struct gl_context *ctx,
 
    if (magStart < magEnd) {
       /* do the magnified texels */
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          for (i = magStart; i < magEnd; i++)
             sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -1065,8 +1065,8 @@ sample_2d_nearest(struct gl_context *ctx,
    GLint i, j;
    (void) ctx;
 
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
+   i = nearest_texel_location(tObj->Sampler.WrapS, img, width, texcoord[0]);
+   j = nearest_texel_location(tObj->Sampler.WrapT, img, height, texcoord[1]);
 
    /* skip over the border, if any */
    i += img->Border;
@@ -1100,8 +1100,8 @@ sample_2d_linear(struct gl_context *ctx,
    GLfloat a, b;
    GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
 
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
+   linear_texel_locations(tObj->Sampler.WrapS, img, width, texcoord[0],  &i0, &i1, &a);
+   linear_texel_locations(tObj->Sampler.WrapT, img, height, texcoord[1], &j0, &j1, &b);
 
    if (img->Border) {
       i0 += img->Border;
@@ -1165,8 +1165,8 @@ sample_2d_linear_repeat(struct gl_context *ctx,
 
    (void) ctx;
 
-   ASSERT(tObj->WrapS == GL_REPEAT);
-   ASSERT(tObj->WrapT == GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapS == GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapT == GL_REPEAT);
    ASSERT(img->Border == 0);
    ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
    ASSERT(img->_IsPowerOfTwo);
@@ -1270,8 +1270,8 @@ sample_2d_linear_mipmap_linear_repeat(struct gl_context *ctx,
 {
    GLuint i;
    ASSERT(lambda != NULL);
-   ASSERT(tObj->WrapS == GL_REPEAT);
-   ASSERT(tObj->WrapT == GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapS == GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapT == GL_REPEAT);
    for (i = 0; i < n; i++) {
       GLint level = linear_mipmap_level(tObj, lambda[i]);
       if (level >= tObj->_MaxLevel) {
@@ -1317,8 +1317,8 @@ sample_linear_2d(struct gl_context *ctx,
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
    (void) lambda;
-   if (tObj->WrapS == GL_REPEAT &&
-       tObj->WrapT == GL_REPEAT &&
+   if (tObj->Sampler.WrapS == GL_REPEAT &&
+       tObj->Sampler.WrapT == GL_REPEAT &&
        image->_IsPowerOfTwo &&
        image->Border == 0) {
       for (i = 0; i < n; i++) {
@@ -1356,8 +1356,8 @@ opt_sample_rgb_2d(struct gl_context *ctx,
    GLuint k;
    (void) ctx;
    (void) lambda;
-   ASSERT(tObj->WrapS==GL_REPEAT);
-   ASSERT(tObj->WrapT==GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapS==GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapT==GL_REPEAT);
    ASSERT(img->Border==0);
    ASSERT(img->TexFormat == MESA_FORMAT_RGB888);
    ASSERT(img->_IsPowerOfTwo);
@@ -1398,8 +1398,8 @@ opt_sample_rgba_2d(struct gl_context *ctx,
    GLuint i;
    (void) ctx;
    (void) lambda;
-   ASSERT(tObj->WrapS==GL_REPEAT);
-   ASSERT(tObj->WrapT==GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapS==GL_REPEAT);
+   ASSERT(tObj->Sampler.WrapT==GL_REPEAT);
    ASSERT(img->Border==0);
    ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888);
    ASSERT(img->_IsPowerOfTwo);
@@ -1428,8 +1428,8 @@ sample_lambda_2d(struct gl_context *ctx,
    GLuint minStart, minEnd;  /* texels with minification */
    GLuint magStart, magEnd;  /* texels with magnification */
 
-   const GLboolean repeatNoBorderPOT = (tObj->WrapS == GL_REPEAT)
-      && (tObj->WrapT == GL_REPEAT)
+   const GLboolean repeatNoBorderPOT = (tObj->Sampler.WrapS == GL_REPEAT)
+      && (tObj->Sampler.WrapT == GL_REPEAT)
       && (tImg->Border == 0 && (tImg->Width == tImg->RowStride))
       && (tImg->_BaseFormat != GL_COLOR_INDEX)
       && tImg->_IsPowerOfTwo;
@@ -1441,7 +1441,7 @@ sample_lambda_2d(struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          if (repeatNoBorderPOT) {
             switch (tImg->TexFormat) {
@@ -1498,7 +1498,7 @@ sample_lambda_2d(struct gl_context *ctx,
       /* do the magnified texels */
       const GLuint m = magEnd - magStart;
 
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          if (repeatNoBorderPOT) {
             switch (tImg->TexFormat) {
@@ -1552,9 +1552,9 @@ sample_3d_nearest(struct gl_context *ctx,
    GLint i, j, k;
    (void) ctx;
 
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
-   k = nearest_texel_location(tObj->WrapR, img, depth, texcoord[2]);
+   i = nearest_texel_location(tObj->Sampler.WrapS, img, width, texcoord[0]);
+   j = nearest_texel_location(tObj->Sampler.WrapT, img, height, texcoord[1]);
+   k = nearest_texel_location(tObj->Sampler.WrapR, img, depth, texcoord[2]);
 
    if (i < 0 || i >= (GLint) img->Width ||
        j < 0 || j >= (GLint) img->Height ||
@@ -1587,9 +1587,9 @@ sample_3d_linear(struct gl_context *ctx,
    GLfloat t000[4], t010[4], t001[4], t011[4];
    GLfloat t100[4], t110[4], t101[4], t111[4];
 
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
-   linear_texel_locations(tObj->WrapR, img, depth, texcoord[2],  &k0, &k1, &c);
+   linear_texel_locations(tObj->Sampler.WrapS, img, width, texcoord[0],  &i0, &i1, &a);
+   linear_texel_locations(tObj->Sampler.WrapT, img, height, texcoord[1], &j0, &j1, &b);
+   linear_texel_locations(tObj->Sampler.WrapR, img, depth, texcoord[2],  &k0, &k1, &c);
 
    if (img->Border) {
       i0 += img->Border;
@@ -1794,7 +1794,7 @@ sample_lambda_3d(struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          for (i = minStart; i < minEnd; i++)
             sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -1829,7 +1829,7 @@ sample_lambda_3d(struct gl_context *ctx,
 
    if (magStart < magEnd) {
       /* do the magnified texels */
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          for (i = magStart; i < magEnd; i++)
             sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -2091,7 +2091,7 @@ sample_lambda_cube(struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          sample_nearest_cube(ctx, tObj, m, texcoords + minStart,
                              lambda + minStart, rgba + minStart);
@@ -2128,7 +2128,7 @@ sample_lambda_cube(struct gl_context *ctx,
    if (magStart < magEnd) {
       /* do the magnified texels */
       const GLuint m = magEnd - magStart;
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          sample_nearest_cube(ctx, tObj, m, texcoords + magStart,
                              lambda + magStart, rgba + magStart);
@@ -2163,18 +2163,18 @@ sample_nearest_rect(struct gl_context *ctx,
    (void) ctx;
    (void) lambda;
 
-   ASSERT(tObj->WrapS == GL_CLAMP ||
-          tObj->WrapS == GL_CLAMP_TO_EDGE ||
-          tObj->WrapS == GL_CLAMP_TO_BORDER);
-   ASSERT(tObj->WrapT == GL_CLAMP ||
-          tObj->WrapT == GL_CLAMP_TO_EDGE ||
-          tObj->WrapT == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->Sampler.WrapS == GL_CLAMP ||
+          tObj->Sampler.WrapS == GL_CLAMP_TO_EDGE ||
+          tObj->Sampler.WrapS == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->Sampler.WrapT == GL_CLAMP ||
+          tObj->Sampler.WrapT == GL_CLAMP_TO_EDGE ||
+          tObj->Sampler.WrapT == GL_CLAMP_TO_BORDER);
    ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
 
    for (i = 0; i < n; i++) {
       GLint row, col;
-      col = clamp_rect_coord_nearest(tObj->WrapS, texcoords[i][0], width);
-      row = clamp_rect_coord_nearest(tObj->WrapT, texcoords[i][1], height);
+      col = clamp_rect_coord_nearest(tObj->Sampler.WrapS, texcoords[i][0], width);
+      row = clamp_rect_coord_nearest(tObj->Sampler.WrapT, texcoords[i][1], height);
       if (col < 0 || col >= width || row < 0 || row >= height)
          get_border_color(tObj, img, rgba[i]);
       else
@@ -2197,12 +2197,12 @@ sample_linear_rect(struct gl_context *ctx,
    (void) ctx;
    (void) lambda;
 
-   ASSERT(tObj->WrapS == GL_CLAMP ||
-          tObj->WrapS == GL_CLAMP_TO_EDGE ||
-          tObj->WrapS == GL_CLAMP_TO_BORDER);
-   ASSERT(tObj->WrapT == GL_CLAMP ||
-          tObj->WrapT == GL_CLAMP_TO_EDGE ||
-          tObj->WrapT == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->Sampler.WrapS == GL_CLAMP ||
+          tObj->Sampler.WrapS == GL_CLAMP_TO_EDGE ||
+          tObj->Sampler.WrapS == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->Sampler.WrapT == GL_CLAMP ||
+          tObj->Sampler.WrapT == GL_CLAMP_TO_EDGE ||
+          tObj->Sampler.WrapT == GL_CLAMP_TO_BORDER);
    ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
 
    for (i = 0; i < n; i++) {
@@ -2211,9 +2211,9 @@ sample_linear_rect(struct gl_context *ctx,
       GLfloat a, b;
       GLbitfield useBorderColor = 0x0;
 
-      clamp_rect_coord_linear(tObj->WrapS, texcoords[i][0], width,
+      clamp_rect_coord_linear(tObj->Sampler.WrapS, texcoords[i][0], width,
                               &i0, &i1, &a);
-      clamp_rect_coord_linear(tObj->WrapT, texcoords[i][1], height,
+      clamp_rect_coord_linear(tObj->Sampler.WrapT, texcoords[i][1], height,
                               &j0, &j1, &b);
 
       /* compute integer rows/columns */
@@ -2264,7 +2264,7 @@ sample_lambda_rect(struct gl_context *ctx,
                           &minStart, &minEnd, &magStart, &magEnd);
 
    if (minStart < minEnd) {
-      if (tObj->MinFilter == GL_NEAREST) {
+      if (tObj->Sampler.MinFilter == GL_NEAREST) {
          sample_nearest_rect(ctx, tObj, minEnd - minStart,
                              texcoords + minStart, NULL, rgba + minStart);
       }
@@ -2274,7 +2274,7 @@ sample_lambda_rect(struct gl_context *ctx,
       }
    }
    if (magStart < magEnd) {
-      if (tObj->MagFilter == GL_NEAREST) {
+      if (tObj->Sampler.MagFilter == GL_NEAREST) {
          sample_nearest_rect(ctx, tObj, magEnd - magStart,
                              texcoords + magStart, NULL, rgba + magStart);
       }
@@ -2307,8 +2307,8 @@ sample_2d_array_nearest(struct gl_context *ctx,
    GLint array;
    (void) ctx;
 
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
+   i = nearest_texel_location(tObj->Sampler.WrapS, img, width, texcoord[0]);
+   j = nearest_texel_location(tObj->Sampler.WrapT, img, height, texcoord[1]);
    array = tex_array_slice(texcoord[2], depth);
 
    if (i < 0 || i >= (GLint) img->Width ||
@@ -2342,12 +2342,12 @@ sample_2d_array_linear(struct gl_context *ctx,
    GLfloat a, b;
    GLfloat t00[4], t01[4], t10[4], t11[4];
 
-   linear_texel_locations(tObj->WrapS, img, width,  texcoord[0], &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
+   linear_texel_locations(tObj->Sampler.WrapS, img, width,  texcoord[0], &i0, &i1, &a);
+   linear_texel_locations(tObj->Sampler.WrapT, img, height, texcoord[1], &j0, &j1, &b);
    array = tex_array_slice(texcoord[2], depth);
 
    if (array < 0 || array >= depth) {
-      COPY_4V(rgba, tObj->BorderColor.f);
+      COPY_4V(rgba, tObj->Sampler.BorderColor.f);
    }
    else {
       if (img->Border) {
@@ -2532,7 +2532,7 @@ sample_lambda_2d_array(struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          for (i = minStart; i < minEnd; i++)
             sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -2575,7 +2575,7 @@ sample_lambda_2d_array(struct gl_context *ctx,
 
    if (magStart < magEnd) {
       /* do the magnified texels */
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          for (i = magStart; i < magEnd; i++)
             sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -2616,7 +2616,7 @@ sample_1d_array_nearest(struct gl_context *ctx,
    GLint array;
    (void) ctx;
 
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
+   i = nearest_texel_location(tObj->Sampler.WrapS, img, width, texcoord[0]);
    array = tex_array_slice(texcoord[1], height);
 
    if (i < 0 || i >= (GLint) img->Width ||
@@ -2648,7 +2648,7 @@ sample_1d_array_linear(struct gl_context *ctx,
    GLfloat a;
    GLfloat t0[4], t1[4];
 
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
+   linear_texel_locations(tObj->Sampler.WrapS, img, width, texcoord[0], &i0, &i1, &a);
    array = tex_array_slice(texcoord[1], height);
 
    if (img->Border) {
@@ -2813,7 +2813,7 @@ sample_lambda_1d_array(struct gl_context *ctx,
    if (minStart < minEnd) {
       /* do the minified texels */
       GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
+      switch (tObj->Sampler.MinFilter) {
       case GL_NEAREST:
          for (i = minStart; i < minEnd; i++)
             sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -2852,7 +2852,7 @@ sample_lambda_1d_array(struct gl_context *ctx,
 
    if (magStart < magEnd) {
       /* do the magnified texels */
-      switch (tObj->MagFilter) {
+      switch (tObj->Sampler.MagFilter) {
       case GL_NEAREST:
          for (i = magStart; i < magEnd; i++)
             sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
@@ -2975,13 +2975,13 @@ choose_depth_texture_level(const struct gl_texture_object *tObj, GLfloat lambda)
 {
    GLint level;
 
-   if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+   if (tObj->Sampler.MinFilter == GL_NEAREST || tObj->Sampler.MinFilter == GL_LINEAR) {
       /* no mipmapping - use base level */
       level = tObj->BaseLevel;
    }
    else {
       /* choose mipmap level */
-      lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);
+      lambda = CLAMP(lambda, tObj->Sampler.MinLod, tObj->Sampler.MaxLod);
       level = (GLint) lambda;
       level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);
    }
@@ -3020,14 +3020,14 @@ sample_depth_texture( struct gl_context *ctx,
           tObj->Target == GL_TEXTURE_1D_ARRAY_EXT ||
           tObj->Target == GL_TEXTURE_2D_ARRAY_EXT);
 
-   ambient = tObj->CompareFailValue;
+   ambient = tObj->Sampler.CompareFailValue;
 
-   /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
+   /* XXXX if tObj->Sampler.MinFilter != tObj->Sampler.MagFilter, we're ignoring lambda */
 
-   function = (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) ?
-      tObj->CompareFunc : GL_NONE;
+   function = (tObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) ?
+      tObj->Sampler.CompareFunc : GL_NONE;
 
-   if (tObj->MagFilter == GL_NEAREST) {
+   if (tObj->Sampler.MagFilter == GL_NEAREST) {
       GLuint i;
       for (i = 0; i < n; i++) {
          GLfloat depthSample, depthRef;
@@ -3040,14 +3040,14 @@ sample_depth_texture( struct gl_context *ctx,
             img->FetchTexelf(img, col, row, slice, &depthSample);
          }
          else {
-            depthSample = tObj->BorderColor.f[0];
+            depthSample = tObj->Sampler.BorderColor.f[0];
          }
 
          depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);
 
          result = shadow_compare(function, depthRef, depthSample, ambient);
 
-         switch (tObj->DepthMode) {
+         switch (tObj->Sampler.DepthMode) {
          case GL_LUMINANCE:
             ASSIGN_4V(texel[i], result, result, result, 1.0F);
             break;
@@ -3067,7 +3067,7 @@ sample_depth_texture( struct gl_context *ctx,
    }
    else {
       GLuint i;
-      ASSERT(tObj->MagFilter == GL_LINEAR);
+      ASSERT(tObj->Sampler.MagFilter == GL_LINEAR);
       for (i = 0; i < n; i++) {
          GLfloat depth00, depth01, depth10, depth11, depthRef;
          GLint i0, i1, j0, j1;
@@ -3095,21 +3095,21 @@ sample_depth_texture( struct gl_context *ctx,
          }
 
          if (slice < 0 || slice >= (GLint) depth) {
-            depth00 = tObj->BorderColor.f[0];
-            depth01 = tObj->BorderColor.f[0];
-            depth10 = tObj->BorderColor.f[0];
-            depth11 = tObj->BorderColor.f[0];
+            depth00 = tObj->Sampler.BorderColor.f[0];
+            depth01 = tObj->Sampler.BorderColor.f[0];
+            depth10 = tObj->Sampler.BorderColor.f[0];
+            depth11 = tObj->Sampler.BorderColor.f[0];
          }
          else {
             /* get four depth samples from the texture */
             if (useBorderTexel & (I0BIT | J0BIT)) {
-               depth00 = tObj->BorderColor.f[0];
+               depth00 = tObj->Sampler.BorderColor.f[0];
             }
             else {
                img->FetchTexelf(img, i0, j0, slice, &depth00);
             }
             if (useBorderTexel & (I1BIT | J0BIT)) {
-               depth10 = tObj->BorderColor.f[0];
+               depth10 = tObj->Sampler.BorderColor.f[0];
             }
             else {
                img->FetchTexelf(img, i1, j0, slice, &depth10);
@@ -3117,13 +3117,13 @@ sample_depth_texture( struct gl_context *ctx,
 
             if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) {
                if (useBorderTexel & (I0BIT | J1BIT)) {
-                  depth01 = tObj->BorderColor.f[0];
+                  depth01 = tObj->Sampler.BorderColor.f[0];
                }
                else {
                   img->FetchTexelf(img, i0, j1, slice, &depth01);
                }
                if (useBorderTexel & (I1BIT | J1BIT)) {
-                  depth11 = tObj->BorderColor.f[0];
+                  depth11 = tObj->Sampler.BorderColor.f[0];
                }
                else {
                   img->FetchTexelf(img, i1, j1, slice, &depth11);
@@ -3141,7 +3141,7 @@ sample_depth_texture( struct gl_context *ctx,
                                   depth00, depth01, depth10, depth11,
                                   ambient, wi, wj);
 
-         switch (tObj->DepthMode) {
+         switch (tObj->Sampler.DepthMode) {
          case GL_LUMINANCE:
             ASSIGN_4V(texel[i], result, result, result, 1.0F);
             break;
@@ -3197,7 +3197,8 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
       return &null_sample_func;
    }
    else {
-      const GLboolean needLambda = (GLboolean) (t->MinFilter != t->MagFilter);
+      const GLboolean needLambda =
+         (GLboolean) (t->Sampler.MinFilter != t->Sampler.MagFilter);
       const GLenum format = t->Image[0][t->BaseLevel]->_BaseFormat;
 
       switch (t->Target) {
@@ -3208,11 +3209,11 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
          else if (needLambda) {
             return &sample_lambda_1d;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_1d;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_1d;
          }
       case GL_TEXTURE_2D:
@@ -3222,22 +3223,22 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
          else if (needLambda) {
             return &sample_lambda_2d;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_2d;
          }
          else {
             /* check for a few optimized cases */
             const struct gl_texture_image *img = t->Image[0][t->BaseLevel];
-            ASSERT(t->MinFilter == GL_NEAREST);
-            if (t->WrapS == GL_REPEAT &&
-                t->WrapT == GL_REPEAT &&
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
+            if (t->Sampler.WrapS == GL_REPEAT &&
+                t->Sampler.WrapT == GL_REPEAT &&
                 img->_IsPowerOfTwo &&
                 img->Border == 0 &&
                 img->TexFormat == MESA_FORMAT_RGB888) {
                return &opt_sample_rgb_2d;
             }
-            else if (t->WrapS == GL_REPEAT &&
-                     t->WrapT == GL_REPEAT &&
+            else if (t->Sampler.WrapS == GL_REPEAT &&
+                     t->Sampler.WrapT == GL_REPEAT &&
                      img->_IsPowerOfTwo &&
                      img->Border == 0 &&
                      img->TexFormat == MESA_FORMAT_RGBA8888) {
@@ -3251,22 +3252,22 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
          if (needLambda) {
             return &sample_lambda_3d;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_3d;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_3d;
          }
       case GL_TEXTURE_CUBE_MAP:
          if (needLambda) {
             return &sample_lambda_cube;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_cube;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_cube;
          }
       case GL_TEXTURE_RECTANGLE_NV:
@@ -3276,33 +3277,33 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
          else if (needLambda) {
             return &sample_lambda_rect;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_rect;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_rect;
          }
       case GL_TEXTURE_1D_ARRAY_EXT:
          if (needLambda) {
             return &sample_lambda_1d_array;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_1d_array;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_1d_array;
          }
       case GL_TEXTURE_2D_ARRAY_EXT:
          if (needLambda) {
             return &sample_lambda_2d_array;
          }
-         else if (t->MinFilter == GL_LINEAR) {
+         else if (t->Sampler.MinFilter == GL_LINEAR) {
             return &sample_linear_2d_array;
          }
          else {
-            ASSERT(t->MinFilter == GL_NEAREST);
+            ASSERT(t->Sampler.MinFilter == GL_NEAREST);
             return &sample_nearest_2d_array;
          }
       default:
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index d07a4ef7513..8a9671aa08a 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -540,7 +540,7 @@ affine_span(struct gl_context *ctx, SWspan *span,
    info.smask = texImg->Width - 1;					\
    info.tmask = texImg->Height - 1;					\
    info.format = texImg->TexFormat;					\
-   info.filter = obj->MinFilter;					\
+   info.filter = obj->Sampler.MinFilter;				\
    info.envmode = unit->EnvMode;					\
    info.er = 0;					\
    info.eg = 0;					\
@@ -805,7 +805,7 @@ fast_persp_span(struct gl_context *ctx, SWspan *span,
    info.smask = texImg->Width - 1;					\
    info.tmask = texImg->Height - 1;					\
    info.format = texImg->TexFormat;					\
-   info.filter = obj->MinFilter;					\
+   info.filter = obj->Sampler.MinFilter;				\
    info.envmode = unit->EnvMode;					\
    info.er = 0;					\
    info.eg = 0;					\
@@ -1044,8 +1044,8 @@ _swrast_choose_triangle( struct gl_context *ctx )
 
          texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL;
          format = texImg ? texImg->TexFormat : MESA_FORMAT_NONE;
-         minFilter = texObj2D ? texObj2D->MinFilter : GL_NONE;
-         magFilter = texObj2D ? texObj2D->MagFilter : GL_NONE;
+         minFilter = texObj2D ? texObj2D->Sampler.MinFilter : GL_NONE;
+         magFilter = texObj2D ? texObj2D->Sampler.MagFilter : GL_NONE;
          envMode = ctx->Texture.Unit[0].EnvMode;
 
          /* First see if we can use an optimized 2-D texture function */
@@ -1054,8 +1054,8 @@ _swrast_choose_triangle( struct gl_context *ctx )
              && !ctx->ATIFragmentShader._Enabled
              && ctx->Texture._EnabledUnits == 0x1
              && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
-             && texObj2D->WrapS == GL_REPEAT
-             && texObj2D->WrapT == GL_REPEAT
+             && texObj2D->Sampler.WrapS == GL_REPEAT
+             && texObj2D->Sampler.WrapT == GL_REPEAT
              && texObj2D->_Swizzle == SWIZZLE_NOOP
              && texImg->_IsPowerOfTwo
              && texImg->Border == 0