Merge branch 'arb_sampler_objects'

66 files changed, 5636 insertions, 3896 deletions

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